diff options
7 files changed, 14 insertions, 6 deletions
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc index b72fd14..dba4955 100644 --- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc +++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc @@ -16,7 +16,6 @@ #include "ui/aura/env.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/screen.h" -#include "ui/views/widget/desktop_aura/desktop_screen.h" #include "ui/views/widget/native_widget_aura.h" #if defined(OS_LINUX) @@ -33,6 +32,10 @@ #endif // defined(OS_WIN) #endif // defined(USE_ASH) +#if !defined(OS_CHROMEOS) +#include "ui/views/widget/desktop_aura/desktop_screen.h" +#endif + namespace { #if !defined(OS_CHROMEOS) && defined(USE_ASH) diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc index 6c6d1c4..62c95e7 100644 --- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc +++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc @@ -19,7 +19,6 @@ #include "ui/gfx/screen_type_delegate.h" #include "ui/keyboard/keyboard.h" #include "ui/keyboard/keyboard_util.h" -#include "ui/views/widget/desktop_aura/desktop_screen.h" #if defined(OS_CHROMEOS) #include "chrome/browser/ui/views/select_file_dialog_extension.h" diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 396df69..efc84fe 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -2857,6 +2857,8 @@ 'browser/ui/ash/chrome_shell_delegate_views.cc', 'browser/ui/ash/multi_user/multi_user_context_menu.cc', 'browser/ui/ash/session_state_delegate_views.cc', + 'browser/ui/aura/active_desktop_monitor.cc', + 'browser/ui/aura/active_desktop_monitor.h', 'browser/ui/startup/default_browser_prompt.cc', 'browser/ui/startup/default_browser_prompt.h', 'browser/ui/external_protocol_dialog_delegate.cc', @@ -2880,6 +2882,7 @@ 'browser/ui/views/notifications/balloon_view_views.cc', 'browser/ui/views/notifications/balloon_view_views.h', 'browser/ui/views/screen_capture_notification_ui_views.cc', + 'browser/ui/views/tabs/window_finder_x11.cc', 'browser/ui/webui/help/version_updater_basic.cc', 'browser/ui/webui/help/version_updater_basic.h', 'browser/ui/webui/signin/inline_login_handler_impl.cc', diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index faf6fe4..d8604c9 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -17,7 +17,6 @@ #include "ui/compositor/test/context_factories_for_test.h" #include "ui/message_center/message_center.h" #include "ui/views/view.h" -#include "ui/views/widget/desktop_aura/desktop_screen.h" #include "ui/views/widget/widget.h" #if defined(USE_ASH) @@ -40,6 +39,8 @@ #include "chromeos/audio/cras_audio_handler.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/network/network_handler.h" +#else // !defined(OS_CHROMEOS) +#include "ui/views/widget/desktop_aura/desktop_screen.h" #endif namespace { diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc index 5789cd6..a2684b5 100644 --- a/content/shell/browser/shell_views.cc +++ b/content/shell/browser/shell_views.cc @@ -33,7 +33,6 @@ #include "ui/views/layout/grid_layout.h" #include "ui/views/test/desktop_test_views_delegate.h" #include "ui/views/view.h" -#include "ui/views/widget/desktop_aura/desktop_screen.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" @@ -41,6 +40,8 @@ #include "chromeos/dbus/dbus_thread_manager.h" #include "ui/aura/test/test_screen.h" #include "ui/wm/test/wm_test_helper.h" +#else // !defined(OS_CHROMEOS) +#include "ui/views/widget/desktop_aura/desktop_screen.h" #endif #if defined(OS_WIN) diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc index 9e9cecb..16e5eb6 100644 --- a/ui/views/examples/content_client/examples_browser_main_parts.cc +++ b/ui/views/examples/content_client/examples_browser_main_parts.cc @@ -18,7 +18,6 @@ #include "ui/gfx/screen.h" #include "ui/views/examples/examples_window_with_content.h" #include "ui/views/test/desktop_test_views_delegate.h" -#include "ui/views/widget/desktop_aura/desktop_screen.h" #include "ui/views/widget/native_widget_aura.h" #include "ui/wm/core/wm_state.h" #include "url/gurl.h" @@ -28,6 +27,8 @@ #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/wm/test/wm_test_helper.h" +#else // !defined(OS_CHROMEOS) +#include "ui/views/widget/desktop_aura/desktop_screen.h" #endif namespace views { diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 60a63a2..4b35744 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -27,7 +27,6 @@ #include "ui/views/drag_utils.h" #include "ui/views/ime/input_method_bridge.h" #include "ui/views/views_delegate.h" -#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #include "ui/views/widget/drop_helper.h" #include "ui/views/widget/native_widget_delegate.h" #include "ui/views/widget/root_view.h" @@ -53,6 +52,7 @@ #endif #if !defined(OS_CHROMEOS) +#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" #endif |