Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
diff --git a/ash/shell.h b/ash/shell.h
index ddb59b6..1f511db 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -19,7 +19,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
-#include "ui/aura/client/activation_change_observer.h"
#include "ui/aura/window.h"
#include "ui/base/ui_base_types.h"
#include "ui/events/event_target.h"
@@ -27,6 +26,7 @@
#include "ui/gfx/screen.h"
#include "ui/gfx/size.h"
#include "ui/wm/core/cursor_manager.h"
+#include "ui/wm/public/activation_change_observer.h"
namespace app_list {
class AppListView;
@@ -501,7 +501,6 @@
void DoInitialWorkspaceAnimation();
#if defined(OS_CHROMEOS)
-#if defined(USE_X11)
// TODO(oshima): Move these objects to DisplayController.
ui::OutputConfigurator* output_configurator() {
return output_configurator_.get();
@@ -512,7 +511,6 @@
internal::DisplayErrorObserver* display_error_observer() {
return display_error_observer_.get();
}
-#endif // defined(USE_X11)
internal::ResolutionNotificationController*
resolution_notification_controller() {
@@ -712,7 +710,6 @@
logout_confirmation_controller_;
scoped_ptr<internal::LastWindowClosedLogoutReminder>
last_window_closed_logout_reminder_;
-#if defined(USE_X11)
// Controls video output device state.
scoped_ptr<ui::OutputConfigurator> output_configurator_;
scoped_ptr<internal::OutputConfiguratorAnimation>
@@ -723,6 +720,7 @@
// Listens for output changes and updates the display manager.
scoped_ptr<internal::DisplayChangeObserver> display_change_observer_;
+#if defined(USE_X11)
scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
scoped_ptr<ui::EventHandler> speech_feedback_handler_;
#endif // defined(USE_X11)