diff options
84 files changed, 274 insertions, 274 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index fa6145a..3faf546 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -158,9 +158,9 @@ 'gpu_support_stub.h', 'high_contrast/high_contrast_controller.cc', 'high_contrast/high_contrast_controller.h', - 'host/root_window_host_factory.cc', - 'host/root_window_host_factory.h', - 'host/root_window_host_factory_win.cc', + 'host/window_tree_host_factory.cc', + 'host/window_tree_host_factory.h', + 'host/window_tree_host_factory_win.cc', 'ime/candidate_view.cc', 'ime/candidate_view.h', 'ime/candidate_window_view.cc', @@ -629,7 +629,7 @@ 'conditions': [ ['OS=="win"', { 'sources/': [ - ['exclude', 'host/root_window_host_factory.cc'], + ['exclude', 'host/window_tree_host_factory.cc'], ['exclude', 'sticky_keys/sticky_keys_controller.cc'], ['exclude', 'sticky_keys/sticky_keys_controller.h'], ], diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index 031a6b1..0bb90b1 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -15,7 +15,7 @@ #include "ash/display/mirror_window_controller.h" #include "ash/display/root_window_transformers.h" #include "ash/display/virtual_keyboard_window_controller.h" -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ash/root_window_controller.h" #include "ash/root_window_settings.h" #include "ash/screen_util.h" @@ -707,7 +707,7 @@ aura::RootWindow* DisplayController::AddRootWindowForDisplay( GetDisplayManager()->GetDisplayInfo(display.id()); const gfx::Rect& bounds_in_native = display_info.bounds_in_native(); aura::RootWindow::CreateParams params(bounds_in_native); - params.host = Shell::GetInstance()->root_window_host_factory()-> + params.host = Shell::GetInstance()->window_tree_host_factory()-> CreateWindowTreeHost(bounds_in_native); aura::RootWindow* root_window = new aura::RootWindow(params); root_window->window()->SetName( diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index 07e5344..3637ad1 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -16,7 +16,7 @@ #include "ash/display/display_info.h" #include "ash/display/display_manager.h" #include "ash/display/root_window_transformers.h" -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ash/root_window_settings.h" #include "ash/shell.h" #include "base/strings/stringprintf.h" @@ -84,7 +84,7 @@ void MirrorWindowController::UpdateWindow(const DisplayInfo& display_info) { if (!root_window_.get()) { const gfx::Rect& bounds_in_native = display_info.bounds_in_native(); aura::RootWindow::CreateParams params(bounds_in_native); - params.host = Shell::GetInstance()->root_window_host_factory()-> + params.host = Shell::GetInstance()->window_tree_host_factory()-> CreateWindowTreeHost(bounds_in_native); root_window_.reset(new aura::RootWindow(params)); root_window_->window()->SetName( diff --git a/ash/display/virtual_keyboard_window_controller.cc b/ash/display/virtual_keyboard_window_controller.cc index f1ac8aa..bdd9cdb 100644 --- a/ash/display/virtual_keyboard_window_controller.cc +++ b/ash/display/virtual_keyboard_window_controller.cc @@ -8,7 +8,7 @@ #include "ash/display/display_info.h" #include "ash/display/display_manager.h" #include "ash/display/root_window_transformers.h" -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ash/root_window_controller.h" #include "ash/root_window_settings.h" #include "ash/shell.h" @@ -42,7 +42,7 @@ void VirtualKeyboardWindowController::UpdateWindow( if (!root_window_controller_.get()) { const gfx::Rect& bounds_in_native = display_info.bounds_in_native(); aura::RootWindow::CreateParams params(bounds_in_native); - params.host = Shell::GetInstance()->root_window_host_factory()-> + params.host = Shell::GetInstance()->window_tree_host_factory()-> CreateWindowTreeHost(bounds_in_native); aura::RootWindow* root_window = new aura::RootWindow(params); diff --git a/ash/host/root_window_host_factory.cc b/ash/host/window_tree_host_factory.cc index 27bb614..ddb60d0 100644 --- a/ash/host/root_window_host_factory.cc +++ b/ash/host/window_tree_host_factory.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ui/aura/window_tree_host.h" diff --git a/ash/host/root_window_host_factory.h b/ash/host/window_tree_host_factory.h index d956628..a17927c 100644 --- a/ash/host/root_window_host_factory.h +++ b/ash/host/window_tree_host_factory.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_HOST_ROOT_WINDOW_HOST_FACTORY_H_ -#define ASH_HOST_ROOT_WINDOW_HOST_FACTORY_H_ +#ifndef ASH_HOST_WINDOW_TREE_HOST_FACTORY_H_ +#define ASH_HOST_WINDOW_TREE_HOST_FACTORY_H_ #include "ash/ash_export.h" #include "ui/gfx/rect.h" @@ -30,4 +30,4 @@ class ASH_EXPORT WindowTreeHostFactory { } // namespace ash -#endif // ASH_HOST_ROOT_WINDOW_HOST_FACTORY_H_ +#endif // ASH_HOST_WINDOW_TREE_HOST_FACTORY_H_ diff --git a/ash/host/root_window_host_factory_win.cc b/ash/host/window_tree_host_factory_win.cc index a072a85..42eb753 100644 --- a/ash/host/root_window_host_factory_win.cc +++ b/ash/host/window_tree_host_factory_win.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ash/ash_switches.h" #include "base/command_line.h" #include "base/win/windows_version.h" -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" #include "ui/aura/window_tree_host.h" namespace { diff --git a/ash/shell.cc b/ash/shell.cc index 5a9f024..39daa14 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -29,7 +29,7 @@ #include "ash/focus_cycler.h" #include "ash/gpu_support.h" #include "ash/high_contrast/high_contrast_controller.h" -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ash/keyboard_uma_event_filter.h" #include "ash/magnifier/magnification_controller.h" #include "ash/magnifier/partial_magnification_controller.h" @@ -811,7 +811,7 @@ void Shell::Init() { focus_cycler_.reset(new internal::FocusCycler()); screen_position_controller_.reset(new internal::ScreenPositionController); - root_window_host_factory_.reset(delegate_->CreateWindowTreeHostFactory()); + window_tree_host_factory_.reset(delegate_->CreateWindowTreeHostFactory()); display_controller_->Start(); display_controller_->InitPrimaryDisplay(); diff --git a/ash/shell.h b/ash/shell.h index 3163c4c..07d0575 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -509,8 +509,8 @@ class ASH_EXPORT Shell } #endif // defined(OS_CHROMEOS) - WindowTreeHostFactory* root_window_host_factory() { - return root_window_host_factory_.get(); + WindowTreeHostFactory* window_tree_host_factory() { + return window_tree_host_factory_.get(); } ShelfModel* shelf_model() { @@ -657,7 +657,7 @@ class ASH_EXPORT Shell scoped_ptr<internal::EventClientImpl> event_client_; scoped_ptr<internal::EventTransformationHandler> event_transformation_handler_; - scoped_ptr<WindowTreeHostFactory> root_window_host_factory_; + scoped_ptr<WindowTreeHostFactory> window_tree_host_factory_; // An event filter that rewrites or drops an event. scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 27da220..3abcdab 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -9,7 +9,7 @@ #include "ash/default_accessibility_delegate.h" #include "ash/default_user_wallpaper_delegate.h" #include "ash/gpu_support_stub.h" -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ash/media_delegate.h" #include "ash/new_window_delegate.h" #include "ash/session_state_delegate.h" diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index cddd713..c1b03ac 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -43,8 +43,8 @@ #include "base/test/test_process_killer_win.h" #include "base/win/metro.h" #include "base/win/windows_version.h" -#include "ui/aura/remote_root_window_host_win.h" -#include "ui/aura/root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" +#include "ui/aura/window_tree_host_win.h" #include "win8/test/test_registrar_constants.h" #endif @@ -143,9 +143,9 @@ void AshTestBase::SetUp() { new TestMetroViewerProcessHost(ipc_thread_->message_loop_proxy())); CHECK(metro_viewer_host_->LaunchViewerAndWaitForConnection( win8::test::kDefaultTestAppUserModelId)); - aura::RemoteWindowTreeHostWin* root_window_host = + aura::RemoteWindowTreeHostWin* window_tree_host = aura::RemoteWindowTreeHostWin::Instance(); - CHECK(root_window_host != NULL); + CHECK(window_tree_host != NULL); } ash::WindowPositioner::SetMaximizeFirstWindow(true); } diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 4ed2dc1..ed154c5 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -31,7 +31,7 @@ #endif #if defined(USE_X11) -#include "ui/aura/root_window_host_x11.h" +#include "ui/aura/window_tree_host_x11.h" #endif namespace ash { diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc index 652b6d4..ddcfa1b 100644 --- a/ash/test/test_metro_viewer_process_host.cc +++ b/ash/test/test_metro_viewer_process_host.cc @@ -7,7 +7,7 @@ #include <windef.h> #include "base/logging.h" -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" namespace ash { namespace test { diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index ade6dae..70e2117 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -9,7 +9,7 @@ #include "ash/caps_lock_delegate_stub.h" #include "ash/default_accessibility_delegate.h" #include "ash/gpu_support_stub.h" -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ash/media_delegate.h" #include "ash/new_window_delegate.h" #include "ash/session_state_delegate.h" diff --git a/chrome/browser/browser_process_platform_part_aurawin.cc b/chrome/browser/browser_process_platform_part_aurawin.cc index d1a00bc..f145439 100644 --- a/chrome/browser/browser_process_platform_part_aurawin.cc +++ b/chrome/browser/browser_process_platform_part_aurawin.cc @@ -19,7 +19,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" BrowserProcessPlatformPart::BrowserProcessPlatformPart() { if (base::win::GetVersion() >= base::win::VERSION_WIN8) { diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 6aa8796..7f89fab 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -49,7 +49,7 @@ #include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" #endif namespace extensions { diff --git a/chrome/browser/lifetime/application_lifetime_win.cc b/chrome/browser/lifetime/application_lifetime_win.cc index f575999..ea00595 100644 --- a/chrome/browser/lifetime/application_lifetime_win.cc +++ b/chrome/browser/lifetime/application_lifetime_win.cc @@ -23,7 +23,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/installer/util/util_constants.h" #include "content/public/browser/web_contents.h" -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" #endif namespace chrome { diff --git a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc index 5aceb9f..72f05b4 100644 --- a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc +++ b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc @@ -31,7 +31,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" #include "url/gurl.h" namespace { diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc index 846835a..6530594 100644 --- a/chrome/browser/plugins/plugin_infobar_delegates.cc +++ b/chrome/browser/plugins/plugin_infobar_delegates.cc @@ -39,7 +39,7 @@ #include "ui/base/win/shell.h" #if defined(USE_AURA) -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" #endif #endif diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index 8247f12..607ea22 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc @@ -7,7 +7,7 @@ #include "apps/shell_window.h" #include "apps/shell_window_registry.h" #include "ash/content_support/gpu_support_impl.h" -#include "ash/host/root_window_host_factory.h" +#include "ash/host/window_tree_host_factory.h" #include "ash/magnifier/magnifier_constants.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.cc index 393ffaa..1e2267f 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/chrome_switches.h" #include "extensions/common/constants.h" -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" bool ChromeLauncherController::LaunchedInNativeDesktop( const std::string& app_id) { diff --git a/chrome/browser/ui/aura/active_desktop_monitor.cc b/chrome/browser/ui/aura/active_desktop_monitor.cc index 32ac371..7fc541b 100644 --- a/chrome/browser/ui/aura/active_desktop_monitor.cc +++ b/chrome/browser/ui/aura/active_desktop_monitor.cc @@ -8,9 +8,9 @@ #include "ui/aura/root_window.h" #if defined(USE_X11) -#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" #elif defined(OS_WIN) -#include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" #endif // static diff --git a/chrome/browser/ui/aura/tabs/dock_info_auralinux.cc b/chrome/browser/ui/aura/tabs/dock_info_auralinux.cc index 298e72b..94e0394 100644 --- a/chrome/browser/ui/aura/tabs/dock_info_auralinux.cc +++ b/chrome/browser/ui/aura/tabs/dock_info_auralinux.cc @@ -13,7 +13,7 @@ #endif #if !defined(OS_CHROMEOS) && defined(USE_X11) -#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" namespace { diff --git a/chrome/browser/ui/views/apps/native_app_window_views_win.cc b/chrome/browser/ui/views/apps/native_app_window_views_win.cc index 21b7fbb..37c4cf5 100644 --- a/chrome/browser/ui/views/apps/native_app_window_views_win.cc +++ b/chrome/browser/ui/views/apps/native_app_window_views_win.cc @@ -11,7 +11,7 @@ #include "chrome/browser/apps/per_app_settings_service_factory.h" #include "chrome/browser/metro_utils/metro_chrome_win.h" #include "extensions/common/extension.h" -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" NativeAppWindowViewsWin::NativeAppWindowViewsWin() { diff --git a/chrome/browser/ui/views/frame/browser_desktop_root_window_host.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h index 0d50a9b..e44f3d4 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_root_window_host.h +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_H_ -#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_H_ +#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_H_ +#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_H_ class BrowserFrame; class BrowserView; @@ -39,4 +39,4 @@ class BrowserDesktopWindowTreeHost { }; -#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_H_ +#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_H_ diff --git a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc index 9dae519..62d67e8 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.cc +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.h" +#include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h" #include <dwmapi.h> diff --git a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h index e2d0172..e504f9d 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.h +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ -#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ +#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_WIN_H_ +#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_WIN_H_ #include <windows.h> #include <uxtheme.h> -#include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" -#include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h" +#include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h" #include "chrome/browser/ui/views/frame/minimize_button_metrics_win.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" class BrowserFrame; class BrowserView; @@ -76,4 +76,4 @@ class BrowserDesktopWindowTreeHostWin : public BrowserDesktopWindowTreeHost, }; -#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ +#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_WIN_H_ diff --git a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc index 2ff9be1..a60608b 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h" +#include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h" //////////////////////////////////////////////////////////////////////////////// // BrowserDesktopWindowTreeHostX11, public: diff --git a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h index 2548797..5b53e5e 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_X11_H_ -#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_X11_H_ +#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ +#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ -#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" -#include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" +#include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h" #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h" class BrowserFrame; @@ -49,4 +49,4 @@ class BrowserDesktopWindowTreeHostX11 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostX11); }; -#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_X11_H_ +#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ diff --git a/chrome/browser/ui/views/frame/browser_frame_ashwin.cc b/chrome/browser/ui/views/frame/browser_frame_ashwin.cc index 66ccdc1..fb009a2 100644 --- a/chrome/browser/ui/views/frame/browser_frame_ashwin.cc +++ b/chrome/browser/ui/views/frame/browser_frame_ashwin.cc @@ -8,7 +8,7 @@ #include "base/message_loop/message_loop.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/metro_utils/metro_chrome_win.h" -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" BrowserFrameAshWin::BrowserFrameAshWin(BrowserFrame* browser_frame, BrowserView* browser_view) diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc index 473f116..9374e1d 100644 --- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc +++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h" +#include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h" #include "chrome/browser/ui/views/frame/browser_shutdown.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/desktop_user_action_handler_aura.h" @@ -33,7 +33,7 @@ DesktopBrowserFrameAura::DesktopBrowserFrameAura( : views::DesktopNativeWidgetAura(browser_frame), browser_view_(browser_view), browser_frame_(browser_frame), - browser_desktop_root_window_host_(NULL) { + browser_desktop_window_tree_host_(NULL) { GetNativeWindow()->SetName("BrowserFrameAura"); } @@ -57,15 +57,15 @@ void DesktopBrowserFrameAura::OnHostClosed() { void DesktopBrowserFrameAura::InitNativeWidget( const views::Widget::InitParams& params) { - browser_desktop_root_window_host_ = + browser_desktop_window_tree_host_ = BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost( browser_frame_, this, browser_view_, browser_frame_); views::Widget::InitParams modified_params = params; - modified_params.desktop_root_window_host = - browser_desktop_root_window_host_->AsDesktopWindowTreeHost(); + modified_params.desktop_window_tree_host = + browser_desktop_window_tree_host_->AsDesktopWindowTreeHost(); DesktopNativeWidgetAura::InitNativeWidget(modified_params); user_action_client_.reset( @@ -92,9 +92,9 @@ const views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() const { } bool DesktopBrowserFrameAura::UsesNativeSystemMenu() const { - return browser_desktop_root_window_host_->UsesNativeSystemMenu(); + return browser_desktop_window_tree_host_->UsesNativeSystemMenu(); } int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const { - return browser_desktop_root_window_host_->GetMinimizeButtonOffset(); + return browser_desktop_window_tree_host_->GetMinimizeButtonOffset(); } diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h index 0ad3f25..edaf381 100644 --- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h +++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h @@ -61,7 +61,7 @@ class DesktopBrowserFrameAura : public views::DesktopNativeWidgetAura, BrowserFrame* browser_frame_; // Owned by the RootWindow. - BrowserDesktopWindowTreeHost* browser_desktop_root_window_host_; + BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_; scoped_ptr<aura::client::UserActionClient> user_action_client_; scoped_ptr<views::corewm::VisibilityController> visibility_controller_; diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc index 403a641..aeb8549 100644 --- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc +++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc @@ -23,7 +23,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" -#include "chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h" +#include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.h b/chrome/browser/ui/views/frame/global_menu_bar_x11.h index f788881..bbb6148 100644 --- a/chrome/browser/ui/views/frame/global_menu_bar_x11.h +++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.h @@ -18,7 +18,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/base/glib/glib_signal.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host_observer_x11.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" typedef struct _DbusmenuMenuitem DbusmenuMenuitem; typedef struct _DbusmenuServer DbusmenuServer; diff --git a/chrome/browser/ui/views/tabs/dock_info_win.cc b/chrome/browser/ui/views/tabs/dock_info_win.cc index 5fa97e7..9ab4c54 100644 --- a/chrome/browser/ui/views/tabs/dock_info_win.cc +++ b/chrome/browser/ui/views/tabs/dock_info_win.cc @@ -17,7 +17,7 @@ #include "ui/views/win/hwnd_util.h" #if defined(USE_AURA) -#include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" #endif namespace { diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index c78aa1c..ec7e09e 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -1904,11 +1904,11 @@ 'browser/ui/views/frame/desktop_browser_frame_aura.h', 'browser/ui/views/frame/desktop_user_action_handler_aura.cc', 'browser/ui/views/frame/desktop_user_action_handler_aura.h', - 'browser/ui/views/frame/browser_desktop_root_window_host.h', - 'browser/ui/views/frame/browser_desktop_root_window_host_win.cc', - 'browser/ui/views/frame/browser_desktop_root_window_host_win.h', - 'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc', - 'browser/ui/views/frame/browser_desktop_root_window_host_x11.h', + 'browser/ui/views/frame/browser_desktop_window_tree_host.h', + 'browser/ui/views/frame/browser_desktop_window_tree_host_win.cc', + 'browser/ui/views/frame/browser_desktop_window_tree_host_win.h', + 'browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc', + 'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h', 'browser/ui/views/frame/glass_browser_frame_view.cc', 'browser/ui/views/frame/glass_browser_frame_view.h', 'browser/ui/views/frame/global_menu_bar_x11.cc', @@ -2841,8 +2841,8 @@ 'browser/ui/views/chrome_views_delegate_aura.cc', 'browser/ui/views/external_protocol_dialog.cc', 'browser/ui/views/external_protocol_dialog.h', - 'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc', - 'browser/ui/views/frame/browser_desktop_root_window_host_x11.h', + 'browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc', + 'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h', 'browser/ui/views/frame/desktop_browser_frame_aura.cc', 'browser/ui/views/frame/desktop_browser_frame_aura.h', 'browser/ui/views/frame/desktop_user_action_handler_aura.cc', @@ -2962,11 +2962,11 @@ ], }, { # else: use_aura==0 'sources/': [ - ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host.h'], - ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_win.cc'], - ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_win.h'], - ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_x11.cc'], - ['exclude', '^browser/ui/views/frame/browser_desktop_root_window_host_x11.h'], + ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host.h'], + ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.cc'], + ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.h'], + ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc'], + ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_x11.h'], ['exclude', '^browser/ui/views/theme_image_mapper_aura_win.cc'], ['exclude', '^browser/ui/webui/gesture_config_ui.cc'], ['exclude', '^browser/ui/webui/gesture_config_ui.h'], diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc index f22d964..6e2811f 100644 --- a/mojo/examples/aura_demo/aura_demo.cc +++ b/mojo/examples/aura_demo/aura_demo.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/message_loop/message_loop.h" #include "mojo/examples/aura_demo/demo_screen.h" -#include "mojo/examples/aura_demo/root_window_host_mojo.h" +#include "mojo/examples/aura_demo/window_tree_host_mojo.h" #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/gles2/gles2_cpp.h" #include "mojo/public/shell/application.h" @@ -126,7 +126,7 @@ class AuraDemo : public Application { mojo::AllocationScope scope; shell()->Connect("mojo:mojo_native_viewport_service", pipe.handle_to_peer.Pass()); - root_window_host_.reset(new WindowTreeHostMojo( + window_tree_host_.reset(new WindowTreeHostMojo( pipe.handle_to_self.Pass(), gfx::Rect(800, 600), base::Bind(&AuraDemo::HostContextCreated, base::Unretained(this)))); @@ -135,10 +135,10 @@ class AuraDemo : public Application { private: void HostContextCreated() { aura::RootWindow::CreateParams params( - gfx::Rect(root_window_host_->bounds().size())); - params.host = root_window_host_.get(); + gfx::Rect(window_tree_host_->bounds().size())); + params.host = window_tree_host_.get(); root_window_.reset(new aura::RootWindow(params)); - root_window_host_->set_delegate(root_window_.get()); + window_tree_host_->set_delegate(root_window_.get()); root_window_->Init(); window_tree_client_.reset(new DemoWindowTreeClient(root_window_->window())); @@ -179,7 +179,7 @@ class AuraDemo : public Application { aura::Window* window2_; aura::Window* window21_; - scoped_ptr<WindowTreeHostMojo> root_window_host_; + scoped_ptr<WindowTreeHostMojo> window_tree_host_; scoped_ptr<aura::RootWindow> root_window_; }; diff --git a/mojo/examples/aura_demo/demo_context_factory.cc b/mojo/examples/aura_demo/demo_context_factory.cc index ad7231f..b1f9d17 100644 --- a/mojo/examples/aura_demo/demo_context_factory.cc +++ b/mojo/examples/aura_demo/demo_context_factory.cc @@ -5,7 +5,7 @@ #include "mojo/examples/aura_demo/demo_context_factory.h" #include "cc/output/output_surface.h" -#include "mojo/examples/aura_demo/root_window_host_mojo.h" +#include "mojo/examples/aura_demo/window_tree_host_mojo.h" #include "mojo/examples/compositor_app/mojo_context_provider.h" #include "ui/compositor/reflector.h" #include "ui/gl/gl_implementation.h" diff --git a/mojo/examples/aura_demo/root_window_host_mojo.cc b/mojo/examples/aura_demo/window_tree_host_mojo.cc index 9264eb9..34e869f 100644 --- a/mojo/examples/aura_demo/root_window_host_mojo.cc +++ b/mojo/examples/aura_demo/window_tree_host_mojo.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/examples/aura_demo/root_window_host_mojo.h" +#include "mojo/examples/aura_demo/window_tree_host_mojo.h" #include "mojo/examples/aura_demo/demo_context_factory.h" #include "mojo/public/bindings/allocation_scope.h" diff --git a/mojo/examples/aura_demo/root_window_host_mojo.h b/mojo/examples/aura_demo/window_tree_host_mojo.h index f851506..957e4ad 100644 --- a/mojo/examples/aura_demo/root_window_host_mojo.h +++ b/mojo/examples/aura_demo/window_tree_host_mojo.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_EXAMPLES_AURA_DEMO_ROOT_WINDOW_HOST_MOJO_H_ -#define MOJO_EXAMPLES_AURA_DEMO_ROOT_WINDOW_HOST_MOJO_H_ +#ifndef MOJO_EXAMPLES_AURA_DEMO_WINDOW_TREE_HOST_MOJO_H_ +#define MOJO_EXAMPLES_AURA_DEMO_WINDOW_TREE_HOST_MOJO_H_ #include "base/bind.h" #include "mojo/public/bindings/remote_ptr.h" @@ -78,4 +78,4 @@ class WindowTreeHostMojo : public aura::WindowTreeHost, } // namespace examples } // namespace mojo -#endif // MOJO_EXAMPLES_AURA_DEMO_ROOT_WINDOW_HOST_MOJO_H_ +#endif // MOJO_EXAMPLES_AURA_DEMO_WINDOW_TREE_HOST_MOJO_H_ diff --git a/mojo/examples/launcher/launcher.cc b/mojo/examples/launcher/launcher.cc index 1ba9043..2f802d9 100644 --- a/mojo/examples/launcher/launcher.cc +++ b/mojo/examples/launcher/launcher.cc @@ -12,7 +12,7 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "mojo/examples/aura_demo/demo_screen.h" -#include "mojo/examples/aura_demo/root_window_host_mojo.h" +#include "mojo/examples/aura_demo/window_tree_host_mojo.h" #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/gles2/gles2_cpp.h" @@ -205,7 +205,7 @@ class LauncherImpl : public Application, shell()->Connect("mojo:mojo_native_viewport_service", pipe.handle_to_peer.Pass()); - root_window_host_.reset(new WindowTreeHostMojo( + window_tree_host_.reset(new WindowTreeHostMojo( pipe.handle_to_self.Pass(), gfx::Rect(50, 50, 450, 60), base::Bind(&LauncherImpl::HostContextCreated, base::Unretained(this)))); } @@ -239,9 +239,9 @@ class LauncherImpl : public Application, void HostContextCreated() { aura::RootWindow::CreateParams params(gfx::Rect(450, 60)); - params.host = root_window_host_.get(); + params.host = window_tree_host_.get(); root_window_.reset(new aura::RootWindow(params)); - root_window_host_->set_delegate(root_window_.get()); + window_tree_host_->set_delegate(root_window_.get()); root_window_->Init(); root_window_->window()->SetBounds(gfx::Rect(450, 60)); @@ -274,7 +274,7 @@ class LauncherImpl : public Application, LauncherController launcher_controller_; RemotePtr<LauncherClient> launcher_client_; - scoped_ptr<WindowTreeHostMojo> root_window_host_; + scoped_ptr<WindowTreeHostMojo> window_tree_host_; scoped_ptr<aura::RootWindow> root_window_; bool pending_show_; diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi index f723e67..ee3c48e 100644 --- a/mojo/mojo_examples.gypi +++ b/mojo/mojo_examples.gypi @@ -103,8 +103,8 @@ 'examples/aura_demo/demo_context_factory.h', 'examples/aura_demo/demo_screen.cc', 'examples/aura_demo/demo_screen.h', - 'examples/aura_demo/root_window_host_mojo.cc', - 'examples/aura_demo/root_window_host_mojo.h', + 'examples/aura_demo/window_tree_host_mojo.cc', + 'examples/aura_demo/window_tree_host_mojo.h', ], }, { diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index 5c72fe7..973ef9f 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -28,7 +28,7 @@ #include "win8/util/win8_util.h" #if defined(USE_AURA) -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #endif diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index fd72faf..9b37c6e 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -89,16 +89,16 @@ 'input_state_lookup_win.h', 'layout_manager.cc', 'layout_manager.h', - 'remote_root_window_host_win.cc', - 'remote_root_window_host_win.h', - 'root_window_host_mac.mm', - 'root_window_host_mac.h', - 'root_window_host_ozone.cc', - 'root_window_host_ozone.h', - 'root_window_host_win.cc', - 'root_window_host_win.h', - 'root_window_host_x11.cc', - 'root_window_host_x11.h', + 'remote_window_tree_host_win.cc', + 'remote_window_tree_host_win.h', + 'window_tree_host_mac.mm', + 'window_tree_host_mac.h', + 'window_tree_host_ozone.cc', + 'window_tree_host_ozone.h', + 'window_tree_host_win.cc', + 'window_tree_host_win.h', + 'window_tree_host_x11.cc', + 'window_tree_host_x11.h', 'root_window_transformer.h', 'root_window.cc', 'root_window.h', @@ -267,7 +267,7 @@ ], 'sources': [ 'gestures/gesture_recognizer_unittest.cc', - 'root_window_host_x11_unittest.cc', + 'window_tree_host_x11_unittest.cc', 'root_window_unittest.cc', 'test/run_all_unittests.cc', 'window_targeter_unittest.cc', diff --git a/ui/aura/remote_root_window_host_win.cc b/ui/aura/remote_window_tree_host_win.cc index 8a508a7..2951571 100644 --- a/ui/aura/remote_root_window_host_win.cc +++ b/ui/aura/remote_window_tree_host_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" #include <windows.h> @@ -20,9 +20,9 @@ #include "ui/base/ime/input_method.h" #include "ui/base/ime/remote_input_method_win.h" #include "ui/base/ime/text_input_client.h" +#include "ui/base/view_prop.h" #include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" -#include "ui/base/view_prop.h" #include "ui/gfx/insets.h" #include "ui/gfx/win/dpi.h" #include "ui/metro_viewer/metro_viewer_messages.h" @@ -31,7 +31,7 @@ namespace aura { namespace { -const char* kWindowTreeHostWinKey = "__AURA_REMOTE_ROOT_WINDOW_HOST_WIN__"; +const char* kWindowTreeHostWinKey = "__AURA_REMOTE_WINDOW_TREE_HOST_WIN__"; // Sets the keystate for the virtual key passed in to down or up. void SetKeyState(uint8* key_states, bool key_down, uint32 virtual_key_code) { diff --git a/ui/aura/remote_root_window_host_win.h b/ui/aura/remote_window_tree_host_win.h index a3a7e4a..738cb17 100644 --- a/ui/aura/remote_root_window_host_win.h +++ b/ui/aura/remote_window_tree_host_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_AURA_REMOTE_ROOT_WINDOW_HOST_WIN_H_ -#define UI_AURA_REMOTE_ROOT_WINDOW_HOST_WIN_H_ +#ifndef UI_AURA_REMOTE_WINDOW_TREE_HOST_WIN_H_ +#define UI_AURA_REMOTE_WINDOW_TREE_HOST_WIN_H_ #include <vector> @@ -306,4 +306,4 @@ class AURA_EXPORT RemoteWindowTreeHostWin } // namespace aura -#endif // UI_AURA_REMOTE_ROOT_WINDOW_HOST_WIN_H_ +#endif // UI_AURA_REMOTE_WINDOW_TREE_HOST_WIN_H_ diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc index 0175eac..ffbd494 100644 --- a/ui/aura/test/aura_test_helper.cc +++ b/ui/aura/test/aura_test_helper.cc @@ -26,7 +26,7 @@ #include "ui/gfx/screen.h" #if defined(USE_X11) -#include "ui/aura/root_window_host_x11.h" +#include "ui/aura/window_tree_host_x11.h" #include "ui/base/x/x11_util.h" #endif diff --git a/ui/aura/window_tree_host.h b/ui/aura/window_tree_host.h index c6fd308..cc5e8b3 100644 --- a/ui/aura/window_tree_host.h +++ b/ui/aura/window_tree_host.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_AURA_ROOT_WINDOW_HOST_H_ -#define UI_AURA_ROOT_WINDOW_HOST_H_ +#ifndef UI_AURA_WINDOW_TREE_HOST_H_ +#define UI_AURA_WINDOW_TREE_HOST_H_ #include <vector> @@ -173,4 +173,4 @@ class AURA_EXPORT WindowTreeHost { } // namespace aura -#endif // UI_AURA_ROOT_WINDOW_HOST_H_ +#endif // UI_AURA_WINDOW_TREE_HOST_H_ diff --git a/ui/aura/window_tree_host_delegate.h b/ui/aura/window_tree_host_delegate.h index bde25d8..eeccb2c 100644 --- a/ui/aura/window_tree_host_delegate.h +++ b/ui/aura/window_tree_host_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_AURA_ROOT_WINDOW_HOST_DELEGATE_H_ -#define UI_AURA_ROOT_WINDOW_HOST_DELEGATE_H_ +#ifndef UI_AURA_WINDOW_TREE_HOST_DELEGATE_H_ +#define UI_AURA_WINDOW_TREE_HOST_DELEGATE_H_ #include "ui/aura/aura_export.h" @@ -56,4 +56,4 @@ class AURA_EXPORT WindowTreeHostDelegate { } // namespace aura -#endif // UI_AURA_ROOT_WINDOW_HOST_DELEGATE_H_ +#endif // UI_AURA_WINDOW_TREE_HOST_DELEGATE_H_ diff --git a/ui/aura/root_window_host_mac.h b/ui/aura/window_tree_host_mac.h index 7cbf082..bdd072f 100644 --- a/ui/aura/root_window_host_mac.h +++ b/ui/aura/window_tree_host_mac.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_AURA_ROOT_WINDOW_HOST_MAC_H_ -#define UI_AURA_ROOT_WINDOW_HOST_MAC_H_ +#ifndef UI_AURA_WINDOW_TREE_HOST_MAC_H_ +#define UI_AURA_WINDOW_TREE_HOST_MAC_H_ #include <vector> @@ -60,4 +60,4 @@ class AURA_EXPORT WindowTreeHostMac : public WindowTreeHost { } // namespace aura -#endif // UI_AURA_ROOT_WINDOW_HOST_MAC_H_ +#endif // UI_AURA_WINDOW_TREE_HOST_MAC_H_ diff --git a/ui/aura/root_window_host_mac.mm b/ui/aura/window_tree_host_mac.mm index 3f18f17..2dd3ded 100644 --- a/ui/aura/root_window_host_mac.mm +++ b/ui/aura/window_tree_host_mac.mm @@ -4,7 +4,7 @@ #include <Cocoa/Cocoa.h> -#include "ui/aura/root_window_host_mac.h" +#include "ui/aura/window_tree_host_mac.h" #include "ui/aura/window_tree_host.h" #include "ui/aura/window_tree_host_delegate.h" diff --git a/ui/aura/root_window_host_ozone.cc b/ui/aura/window_tree_host_ozone.cc index d1ef074..4458965 100644 --- a/ui/aura/root_window_host_ozone.cc +++ b/ui/aura/window_tree_host_ozone.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/root_window_host_ozone.h" +#include "ui/aura/window_tree_host_ozone.h" #include "ui/aura/root_window.h" #include "ui/events/ozone/event_factory_ozone.h" diff --git a/ui/aura/root_window_host_ozone.h b/ui/aura/window_tree_host_ozone.h index ca8226d..3529ac6 100644 --- a/ui/aura/root_window_host_ozone.h +++ b/ui/aura/window_tree_host_ozone.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_AURA_ROOT_WINDOW_HOST_OZONE_H_ -#define UI_AURA_ROOT_WINDOW_HOST_OZONE_H_ +#ifndef UI_AURA_WINDOW_TREE_HOST_OZONE_H_ +#define UI_AURA_WINDOW_TREE_HOST_OZONE_H_ #include <vector> @@ -61,4 +61,4 @@ class WindowTreeHostOzone : public WindowTreeHost, } // namespace aura -#endif // UI_AURA_ROOT_WINDOW_HOST_OZONE_H_ +#endif // UI_AURA_WINDOW_TREE_HOST_OZONE_H_ diff --git a/ui/aura/root_window_host_win.cc b/ui/aura/window_tree_host_win.cc index 1c7054f..6ae1933 100644 --- a/ui/aura/root_window_host_win.cc +++ b/ui/aura/window_tree_host_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/root_window_host_win.h" +#include "ui/aura/window_tree_host_win.h" #include <windows.h> @@ -12,8 +12,8 @@ #include "ui/aura/client/cursor_client.h" #include "ui/aura/root_window.h" #include "ui/base/cursor/cursor_loader_win.h" -#include "ui/events/event.h" #include "ui/base/view_prop.h" +#include "ui/events/event.h" #include "ui/gfx/display.h" #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" diff --git a/ui/aura/root_window_host_win.h b/ui/aura/window_tree_host_win.h index 96f3e35..86976f5 100644 --- a/ui/aura/root_window_host_win.h +++ b/ui/aura/window_tree_host_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_AURA_ROOT_WINDOW_HOST_WIN_H_ -#define UI_AURA_ROOT_WINDOW_HOST_WIN_H_ +#ifndef UI_AURA_WINDOW_TREE_HOST_WIN_H_ +#define UI_AURA_WINDOW_TREE_HOST_WIN_H_ #include "base/compiler_specific.h" #include "ui/aura/aura_export.h" @@ -101,4 +101,4 @@ AURA_EXPORT void SetUsePopupAsRootWindowForTest(bool use); } // namespace aura -#endif // UI_AURA_ROOT_WINDOW_HOST_WIN_H_ +#endif // UI_AURA_WINDOW_TREE_HOST_WIN_H_ diff --git a/ui/aura/root_window_host_x11.cc b/ui/aura/window_tree_host_x11.cc index 44e3fa2..7fdb3ce6 100644 --- a/ui/aura/root_window_host_x11.cc +++ b/ui/aura/window_tree_host_x11.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/aura/root_window_host_x11.h" +#include "ui/aura/window_tree_host_x11.h" #include <strings.h> #include <X11/cursorfont.h> diff --git a/ui/aura/root_window_host_x11.h b/ui/aura/window_tree_host_x11.h index f480205..d0b7b3b 100644 --- a/ui/aura/root_window_host_x11.h +++ b/ui/aura/window_tree_host_x11.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_AURA_ROOT_WINDOW_HOST_X11_H_ -#define UI_AURA_ROOT_WINDOW_HOST_X11_H_ +#ifndef UI_AURA_WINDOW_TREE_HOST_X11_H_ +#define UI_AURA_WINDOW_TREE_HOST_X11_H_ #include <X11/Xlib.h> @@ -147,4 +147,4 @@ AURA_EXPORT void SetUseOverrideRedirectWindowByDefault(bool override_redirect); } // namespace test } // namespace aura -#endif // UI_AURA_ROOT_WINDOW_HOST_X11_H_ +#endif // UI_AURA_WINDOW_TREE_HOST_X11_H_ diff --git a/ui/aura/root_window_host_x11_unittest.cc b/ui/aura/window_tree_host_x11_unittest.cc index 4efb8fd..9af33ef 100644 --- a/ui/aura/root_window_host_x11_unittest.cc +++ b/ui/aura/window_tree_host_x11_unittest.cc @@ -6,9 +6,9 @@ #include "base/sys_info.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/root_window.h" -#include "ui/aura/root_window_host_x11.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/window_tree_host_delegate.h" +#include "ui/aura/window_tree_host_x11.h" #include "ui/events/event_processor.h" #include "ui/events/event_target.h" #include "ui/events/event_target_iterator.h" @@ -99,11 +99,11 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) { base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time()); #endif // defined(OS_CHROMEOS) - scoped_ptr<WindowTreeHostX11> root_window_host( + scoped_ptr<WindowTreeHostX11> window_tree_host( new WindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700))); scoped_ptr<TestWindowTreeHostDelegate> delegate( new TestWindowTreeHostDelegate()); - root_window_host->set_delegate(delegate.get()); + window_tree_host->set_delegate(delegate.get()); std::vector<unsigned int> devices; devices.push_back(0); @@ -118,7 +118,7 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) { // This touch is out of bounds. scoped_xevent.InitTouchEvent( 0, XI_TouchBegin, 5, gfx::Point(1500, 2500), valuators); - root_window_host->Dispatch(scoped_xevent); + window_tree_host->Dispatch(scoped_xevent); EXPECT_EQ(ui::ET_UNKNOWN, delegate->last_touch_type()); EXPECT_EQ(-1, delegate->last_touch_id()); EXPECT_EQ(gfx::Point(0, 0), delegate->last_touch_location()); @@ -127,21 +127,21 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) { // Following touchs are within bounds and are passed to delegate. scoped_xevent.InitTouchEvent( 0, XI_TouchBegin, 5, gfx::Point(1500, 1500), valuators); - root_window_host->Dispatch(scoped_xevent); + window_tree_host->Dispatch(scoped_xevent); EXPECT_EQ(ui::ET_TOUCH_PRESSED, delegate->last_touch_type()); EXPECT_EQ(0, delegate->last_touch_id()); EXPECT_EQ(gfx::Point(1500, 1500), delegate->last_touch_location()); scoped_xevent.InitTouchEvent( 0, XI_TouchUpdate, 5, gfx::Point(1500, 1600), valuators); - root_window_host->Dispatch(scoped_xevent); + window_tree_host->Dispatch(scoped_xevent); EXPECT_EQ(ui::ET_TOUCH_MOVED, delegate->last_touch_type()); EXPECT_EQ(0, delegate->last_touch_id()); EXPECT_EQ(gfx::Point(1500, 1600), delegate->last_touch_location()); scoped_xevent.InitTouchEvent( 0, XI_TouchEnd, 5, gfx::Point(1500, 1600), valuators); - root_window_host->Dispatch(scoped_xevent); + window_tree_host->Dispatch(scoped_xevent); EXPECT_EQ(ui::ET_TOUCH_RELEASED, delegate->last_touch_type()); EXPECT_EQ(0, delegate->last_touch_id()); EXPECT_EQ(gfx::Point(1500, 1600), delegate->last_touch_location()); @@ -164,18 +164,18 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) { const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n"; base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time()); - scoped_ptr<WindowTreeHostX11> root_window_host1( + scoped_ptr<WindowTreeHostX11> window_tree_host1( new WindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700))); scoped_ptr<TestWindowTreeHostDelegate> delegate1( new TestWindowTreeHostDelegate()); - root_window_host1->set_delegate(delegate1.get()); + window_tree_host1->set_delegate(delegate1.get()); int host2_y_offset = 1700; - scoped_ptr<WindowTreeHostX11> root_window_host2( + scoped_ptr<WindowTreeHostX11> window_tree_host2( new WindowTreeHostX11(gfx::Rect(0, host2_y_offset, 1920, 1080))); scoped_ptr<TestWindowTreeHostDelegate> delegate2( new TestWindowTreeHostDelegate()); - root_window_host2->set_delegate(delegate2.get()); + window_tree_host2->set_delegate(delegate2.get()); std::vector<unsigned int> devices; devices.push_back(0); @@ -191,8 +191,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) { ui::ScopedXI2Event scoped_xevent; scoped_xevent.InitTouchEvent( 0, XI_TouchBegin, 5, gfx::Point(1500, 2500), valuators); - root_window_host1->Dispatch(scoped_xevent); - root_window_host2->Dispatch(scoped_xevent); + window_tree_host1->Dispatch(scoped_xevent); + window_tree_host2->Dispatch(scoped_xevent); EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type()); EXPECT_EQ(-1, delegate1->last_touch_id()); EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location()); @@ -203,8 +203,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) { scoped_xevent.InitTouchEvent( 0, XI_TouchBegin, 6, gfx::Point(1600, 2600), valuators); - root_window_host1->Dispatch(scoped_xevent); - root_window_host2->Dispatch(scoped_xevent); + window_tree_host1->Dispatch(scoped_xevent); + window_tree_host2->Dispatch(scoped_xevent); EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type()); EXPECT_EQ(-1, delegate1->last_touch_id()); EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location()); @@ -215,8 +215,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) { scoped_xevent.InitTouchEvent( 0, XI_TouchUpdate, 5, gfx::Point(1500, 2550), valuators); - root_window_host1->Dispatch(scoped_xevent); - root_window_host2->Dispatch(scoped_xevent); + window_tree_host1->Dispatch(scoped_xevent); + window_tree_host2->Dispatch(scoped_xevent); EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type()); EXPECT_EQ(-1, delegate1->last_touch_id()); EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location()); @@ -227,8 +227,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) { scoped_xevent.InitTouchEvent( 0, XI_TouchUpdate, 6, gfx::Point(1600, 2650), valuators); - root_window_host1->Dispatch(scoped_xevent); - root_window_host2->Dispatch(scoped_xevent); + window_tree_host1->Dispatch(scoped_xevent); + window_tree_host2->Dispatch(scoped_xevent); EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type()); EXPECT_EQ(-1, delegate1->last_touch_id()); EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location()); @@ -239,8 +239,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) { scoped_xevent.InitTouchEvent( 0, XI_TouchEnd, 5, gfx::Point(1500, 2550), valuators); - root_window_host1->Dispatch(scoped_xevent); - root_window_host2->Dispatch(scoped_xevent); + window_tree_host1->Dispatch(scoped_xevent); + window_tree_host2->Dispatch(scoped_xevent); EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type()); EXPECT_EQ(-1, delegate1->last_touch_id()); EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location()); @@ -251,8 +251,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) { scoped_xevent.InitTouchEvent( 0, XI_TouchEnd, 6, gfx::Point(1600, 2650), valuators); - root_window_host1->Dispatch(scoped_xevent); - root_window_host2->Dispatch(scoped_xevent); + window_tree_host1->Dispatch(scoped_xevent); + window_tree_host2->Dispatch(scoped_xevent); EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type()); EXPECT_EQ(-1, delegate1->last_touch_id()); EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location()); diff --git a/ui/events/event_utils.h b/ui/events/event_utils.h index d261108..e077522 100644 --- a/ui/events/event_utils.h +++ b/ui/events/event_utils.h @@ -49,7 +49,7 @@ EVENTS_EXPORT base::TimeDelta EventTimeForNow(); // Get the location from a native event. The coordinate system of the resultant // |Point| has the origin at top-left of the "root window". The nature of // this "root window" and how it maps to platform-specific drawing surfaces is -// defined in ui/aura/root_window.* and ui/aura/root_window_host*. +// defined in ui/aura/root_window.* and ui/aura/window_tree_host*. // TODO(tdresser): Return gfx::PointF here. See crbug.com/337827. EVENTS_EXPORT gfx::Point EventLocationFromNative( const base::NativeEvent& native_event); diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc index f92e57b..228b0f1 100644 --- a/ui/shell_dialogs/select_file_dialog_win.cc +++ b/ui/shell_dialogs/select_file_dialog_win.cc @@ -32,7 +32,7 @@ #include "ui/shell_dialogs/shell_dialogs_delegate.h" #if defined(USE_AURA) -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #endif diff --git a/ui/views/test/ui_controls_factory_desktop_aurax11.cc b/ui/views/test/ui_controls_factory_desktop_aurax11.cc index 6db2e4a..e5ea7f3 100644 --- a/ui/views/test/ui_controls_factory_desktop_aurax11.cc +++ b/ui/views/test/ui_controls_factory_desktop_aurax11.cc @@ -19,7 +19,7 @@ #include "ui/base/x/x11_util.h" #include "ui/compositor/dip_util.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" namespace views { namespace test { diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 6ffcbc1..01de5c6 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -387,12 +387,12 @@ 'widget/desktop_aura/desktop_native_cursor_manager.h', 'widget/desktop_aura/desktop_native_widget_aura.cc', 'widget/desktop_aura/desktop_native_widget_aura.h', - 'widget/desktop_aura/desktop_root_window_host.h', - 'widget/desktop_aura/desktop_root_window_host_ozone.cc', - 'widget/desktop_aura/desktop_root_window_host_win.cc', - 'widget/desktop_aura/desktop_root_window_host_win.h', - 'widget/desktop_aura/desktop_root_window_host_x11.cc', - 'widget/desktop_aura/desktop_root_window_host_x11.h', + 'widget/desktop_aura/desktop_window_tree_host.h', + 'widget/desktop_aura/desktop_window_tree_host_ozone.cc', + 'widget/desktop_aura/desktop_window_tree_host_win.cc', + 'widget/desktop_aura/desktop_window_tree_host_win.h', + 'widget/desktop_aura/desktop_window_tree_host_x11.cc', + 'widget/desktop_aura/desktop_window_tree_host_x11.h', 'widget/desktop_aura/desktop_screen.h', 'widget/desktop_aura/desktop_screen_ozone.cc', 'widget/desktop_aura/desktop_screen_position_client.cc', @@ -505,7 +505,7 @@ ['include', 'widget/desktop_aura/desktop_screen_win.cc'], ['include', 'widget/desktop_aura/desktop_drag_drop_client_win.cc'], ['include', 'widget/desktop_aura/desktop_drop_target_win.cc'], - ['include', 'widget/desktop_aura/desktop_root_window_host_win.cc'], + ['include', 'widget/desktop_aura/desktop_window_tree_host_win.cc'], ['include', 'widget/monitor_win.cc'], ['include', 'widget/monitor_win.h'], ['include', 'win/appbar.cc'], @@ -792,7 +792,7 @@ 'view_model_utils_unittest.cc', 'view_unittest.cc', 'widget/desktop_aura/desktop_native_widget_aura_unittest.cc', - 'widget/desktop_aura/desktop_root_window_host_win_unittest.cc', + 'widget/desktop_aura/desktop_window_tree_host_win_unittest.cc', 'widget/desktop_aura/desktop_screen_x11_unittest.cc', 'widget/desktop_aura/desktop_screen_position_client_unittest.cc', 'widget/native_widget_aura_unittest.cc', diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc index 5669f31..f21a805 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.cc @@ -9,7 +9,7 @@ #include "ui/base/dragdrop/drop_target_event.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/views/widget/desktop_aura/desktop_drop_target_win.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" #include "ui/views/widget/drop_target_win.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc index ece73fa..67c619b 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -46,8 +46,8 @@ #include "ui/views/widget/desktop_aura/desktop_event_client.h" #include "ui/views/widget/desktop_aura/desktop_focus_rules.h" #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host.h" #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" #include "ui/views/widget/drop_helper.h" #include "ui/views/widget/native_widget_aura.h" #include "ui/views/widget/root_view.h" @@ -231,7 +231,7 @@ DesktopNativeWidgetAura::DesktopNativeWidgetAura( : ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET), close_widget_factory_(this), can_activate_(true), - desktop_root_window_host_(NULL), + desktop_window_tree_host_(NULL), content_window_container_(NULL), content_window_(new aura::Window(this)), native_widget_delegate_(delegate), @@ -298,8 +298,8 @@ void DesktopNativeWidgetAura::OnHostClosed() { root_window_->RemoveRootWindowObserver(this); root_window_.reset(); // Uses input_method_event_filter_ at destruction. - // RootWindow owns |desktop_root_window_host_|. - desktop_root_window_host_ = NULL; + // RootWindow owns |desktop_window_tree_host_|. + desktop_window_tree_host_ = NULL; content_window_ = NULL; native_widget_delegate_->OnNativeWidgetDestroyed(); @@ -392,11 +392,11 @@ void DesktopNativeWidgetAura::InitNativeWidget( content_window_container_->Show(); content_window_container_->AddChild(content_window_); - desktop_root_window_host_ = params.desktop_root_window_host ? - params.desktop_root_window_host : + desktop_window_tree_host_ = params.desktop_window_tree_host ? + params.desktop_window_tree_host : DesktopWindowTreeHost::Create(native_widget_delegate_, this); aura::RootWindow::CreateParams rw_params(params.bounds); - desktop_root_window_host_->Init(content_window_, params, &rw_params); + desktop_window_tree_host_->Init(content_window_, params, &rw_params); root_window_.reset(new aura::RootWindow(rw_params)); root_window_->Init(); @@ -435,7 +435,7 @@ void DesktopNativeWidgetAura::InitNativeWidget( native_cursor_manager_->AddRootWindow(root_window_.get()); aura::client::SetCursorClient(root_window_->window(), cursor_manager_); - desktop_root_window_host_->OnRootWindowCreated(root_window_.get(), params); + desktop_window_tree_host_->OnRootWindowCreated(root_window_.get(), params); UpdateWindowTransparency(); @@ -458,7 +458,7 @@ void DesktopNativeWidgetAura::InitNativeWidget( InstallInputMethodEventFilter(); - drag_drop_client_ = desktop_root_window_host_->CreateDragDropClient( + drag_drop_client_ = desktop_window_tree_host_->CreateDragDropClient( native_cursor_manager_); aura::client::SetDragDropClient(root_window_->window(), drag_drop_client_.get()); @@ -480,7 +480,7 @@ void DesktopNativeWidgetAura::InitNativeWidget( tooltip_controller_.reset( new corewm::TooltipController( - desktop_root_window_host_->CreateTooltip())); + desktop_window_tree_host_->CreateTooltip())); aura::client::SetTooltipClient(root_window_->window(), tooltip_controller_.get()); root_window_->window()->AddPreTargetHandler(tooltip_controller_.get()); @@ -522,19 +522,19 @@ void DesktopNativeWidgetAura::InitNativeWidget( } NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() { - return desktop_root_window_host_->CreateNonClientFrameView(); + return desktop_window_tree_host_->CreateNonClientFrameView(); } bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const { - return desktop_root_window_host_->ShouldUseNativeFrame(); + return desktop_window_tree_host_->ShouldUseNativeFrame(); } bool DesktopNativeWidgetAura::ShouldWindowContentsBeTransparent() const { - return desktop_root_window_host_->ShouldWindowContentsBeTransparent(); + return desktop_window_tree_host_->ShouldWindowContentsBeTransparent(); } void DesktopNativeWidgetAura::FrameTypeChanged() { - desktop_root_window_host_->FrameTypeChanged(); + desktop_window_tree_host_->FrameTypeChanged(); UpdateWindowTransparency(); } @@ -609,7 +609,7 @@ void DesktopNativeWidgetAura::ReleaseCapture() { bool DesktopNativeWidgetAura::HasCapture() const { return content_window_ && content_window_->HasCapture() && - desktop_root_window_host_->HasCapture(); + desktop_window_tree_host_->HasCapture(); } InputMethod* DesktopNativeWidgetAura::CreateInputMethod() { @@ -624,48 +624,48 @@ internal::InputMethodDelegate* void DesktopNativeWidgetAura::CenterWindow(const gfx::Size& size) { if (content_window_) - desktop_root_window_host_->CenterWindow(size); + desktop_window_tree_host_->CenterWindow(size); } void DesktopNativeWidgetAura::GetWindowPlacement( gfx::Rect* bounds, ui::WindowShowState* maximized) const { if (content_window_) - desktop_root_window_host_->GetWindowPlacement(bounds, maximized); + desktop_window_tree_host_->GetWindowPlacement(bounds, maximized); } bool DesktopNativeWidgetAura::SetWindowTitle(const base::string16& title) { if (!content_window_) return false; - return desktop_root_window_host_->SetWindowTitle(title); + return desktop_window_tree_host_->SetWindowTitle(title); } void DesktopNativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon, const gfx::ImageSkia& app_icon) { if (content_window_) - desktop_root_window_host_->SetWindowIcons(window_icon, app_icon); + desktop_window_tree_host_->SetWindowIcons(window_icon, app_icon); } void DesktopNativeWidgetAura::InitModalType(ui::ModalType modal_type) { // 99% of the time, we should not be asked to create a // DesktopNativeWidgetAura that is modal. We only support window modal // dialogs on the same lines as non AURA. - desktop_root_window_host_->InitModalType(modal_type); + desktop_window_tree_host_->InitModalType(modal_type); } gfx::Rect DesktopNativeWidgetAura::GetWindowBoundsInScreen() const { return content_window_ ? - desktop_root_window_host_->GetWindowBoundsInScreen() : gfx::Rect(); + desktop_window_tree_host_->GetWindowBoundsInScreen() : gfx::Rect(); } gfx::Rect DesktopNativeWidgetAura::GetClientAreaBoundsInScreen() const { return content_window_ ? - desktop_root_window_host_->GetClientAreaBoundsInScreen() : gfx::Rect(); + desktop_window_tree_host_->GetClientAreaBoundsInScreen() : gfx::Rect(); } gfx::Rect DesktopNativeWidgetAura::GetRestoredBounds() const { return content_window_ ? - desktop_root_window_host_->GetRestoredBounds() : gfx::Rect(); + desktop_window_tree_host_->GetRestoredBounds() : gfx::Rect(); } void DesktopNativeWidgetAura::SetBounds(const gfx::Rect& bounds) { @@ -684,12 +684,12 @@ void DesktopNativeWidgetAura::SetBounds(const gfx::Rect& bounds) { gfx::Rect bounds_in_pixels( gfx::ToCeiledPoint(gfx::ScalePoint(bounds.origin(), scale)), gfx::ToFlooredSize(gfx::ScaleSize(bounds.size(), scale))); - desktop_root_window_host_->AsWindowTreeHost()->SetBounds(bounds_in_pixels); + desktop_window_tree_host_->AsWindowTreeHost()->SetBounds(bounds_in_pixels); } void DesktopNativeWidgetAura::SetSize(const gfx::Size& size) { if (content_window_) - desktop_root_window_host_->SetSize(size); + desktop_window_tree_host_->SetSize(size); } void DesktopNativeWidgetAura::StackAbove(gfx::NativeView native_view) { @@ -697,7 +697,7 @@ void DesktopNativeWidgetAura::StackAbove(gfx::NativeView native_view) { void DesktopNativeWidgetAura::StackAtTop() { if (content_window_) - desktop_root_window_host_->StackAtTop(); + desktop_window_tree_host_->StackAtTop(); } void DesktopNativeWidgetAura::StackBelow(gfx::NativeView native_view) { @@ -705,7 +705,7 @@ void DesktopNativeWidgetAura::StackBelow(gfx::NativeView native_view) { void DesktopNativeWidgetAura::SetShape(gfx::NativeRegion shape) { if (content_window_) - desktop_root_window_host_->SetShape(shape); + desktop_window_tree_host_->SetShape(shape); } void DesktopNativeWidgetAura::Close() { @@ -715,25 +715,25 @@ void DesktopNativeWidgetAura::Close() { content_window_->SuppressPaint(); content_window_->Hide(); - desktop_root_window_host_->Close(); + desktop_window_tree_host_->Close(); } void DesktopNativeWidgetAura::CloseNow() { if (content_window_) - desktop_root_window_host_->CloseNow(); + desktop_window_tree_host_->CloseNow(); } void DesktopNativeWidgetAura::Show() { if (!content_window_) return; - desktop_root_window_host_->AsWindowTreeHost()->Show(); + desktop_window_tree_host_->AsWindowTreeHost()->Show(); content_window_->Show(); } void DesktopNativeWidgetAura::Hide() { if (!content_window_) return; - desktop_root_window_host_->AsWindowTreeHost()->Hide(); + desktop_window_tree_host_->AsWindowTreeHost()->Hide(); content_window_->Hide(); } @@ -741,79 +741,79 @@ void DesktopNativeWidgetAura::ShowMaximizedWithBounds( const gfx::Rect& restored_bounds) { if (!content_window_) return; - desktop_root_window_host_->ShowMaximizedWithBounds(restored_bounds); + desktop_window_tree_host_->ShowMaximizedWithBounds(restored_bounds); content_window_->Show(); } void DesktopNativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) { if (!content_window_) return; - desktop_root_window_host_->ShowWindowWithState(state); + desktop_window_tree_host_->ShowWindowWithState(state); content_window_->Show(); } bool DesktopNativeWidgetAura::IsVisible() const { - return content_window_ && desktop_root_window_host_->IsVisible(); + return content_window_ && desktop_window_tree_host_->IsVisible(); } void DesktopNativeWidgetAura::Activate() { if (content_window_) - desktop_root_window_host_->Activate(); + desktop_window_tree_host_->Activate(); } void DesktopNativeWidgetAura::Deactivate() { if (content_window_) - desktop_root_window_host_->Deactivate(); + desktop_window_tree_host_->Deactivate(); } bool DesktopNativeWidgetAura::IsActive() const { - return content_window_ && desktop_root_window_host_->IsActive(); + return content_window_ && desktop_window_tree_host_->IsActive(); } void DesktopNativeWidgetAura::SetAlwaysOnTop(bool always_on_top) { if (content_window_) - desktop_root_window_host_->SetAlwaysOnTop(always_on_top); + desktop_window_tree_host_->SetAlwaysOnTop(always_on_top); } bool DesktopNativeWidgetAura::IsAlwaysOnTop() const { - return content_window_ && desktop_root_window_host_->IsAlwaysOnTop(); + return content_window_ && desktop_window_tree_host_->IsAlwaysOnTop(); } void DesktopNativeWidgetAura::Maximize() { if (content_window_) - desktop_root_window_host_->Maximize(); + desktop_window_tree_host_->Maximize(); } void DesktopNativeWidgetAura::Minimize() { if (content_window_) - desktop_root_window_host_->Minimize(); + desktop_window_tree_host_->Minimize(); } bool DesktopNativeWidgetAura::IsMaximized() const { - return content_window_ && desktop_root_window_host_->IsMaximized(); + return content_window_ && desktop_window_tree_host_->IsMaximized(); } bool DesktopNativeWidgetAura::IsMinimized() const { - return content_window_ && desktop_root_window_host_->IsMinimized(); + return content_window_ && desktop_window_tree_host_->IsMinimized(); } void DesktopNativeWidgetAura::Restore() { if (content_window_) - desktop_root_window_host_->Restore(); + desktop_window_tree_host_->Restore(); } void DesktopNativeWidgetAura::SetFullscreen(bool fullscreen) { if (content_window_) - desktop_root_window_host_->SetFullscreen(fullscreen); + desktop_window_tree_host_->SetFullscreen(fullscreen); } bool DesktopNativeWidgetAura::IsFullscreen() const { - return content_window_ && desktop_root_window_host_->IsFullscreen(); + return content_window_ && desktop_window_tree_host_->IsFullscreen(); } void DesktopNativeWidgetAura::SetOpacity(unsigned char opacity) { if (content_window_) - desktop_root_window_host_->SetOpacity(opacity); + desktop_window_tree_host_->SetOpacity(opacity); } void DesktopNativeWidgetAura::SetUseDragFrame(bool use_drag_frame) { @@ -821,7 +821,7 @@ void DesktopNativeWidgetAura::SetUseDragFrame(bool use_drag_frame) { void DesktopNativeWidgetAura::FlashFrame(bool flash_frame) { if (content_window_) - desktop_root_window_host_->FlashFrame(flash_frame); + desktop_window_tree_host_->FlashFrame(flash_frame); } void DesktopNativeWidgetAura::RunShellDrag( @@ -855,7 +855,7 @@ bool DesktopNativeWidgetAura::IsMouseEventsEnabled() const { } void DesktopNativeWidgetAura::ClearNativeFocus() { - desktop_root_window_host_->ClearNativeFocus(); + desktop_window_tree_host_->ClearNativeFocus(); if (ShouldActivate()) { aura::client::GetFocusClient(content_window_)-> @@ -864,8 +864,8 @@ void DesktopNativeWidgetAura::ClearNativeFocus() { } gfx::Rect DesktopNativeWidgetAura::GetWorkAreaBoundsInScreen() const { - return desktop_root_window_host_ ? - desktop_root_window_host_->GetWorkAreaBoundsInScreen() : gfx::Rect(); + return desktop_window_tree_host_ ? + desktop_window_tree_host_->GetWorkAreaBoundsInScreen() : gfx::Rect(); } Widget::MoveLoopResult DesktopNativeWidgetAura::RunMoveLoop( @@ -874,19 +874,19 @@ Widget::MoveLoopResult DesktopNativeWidgetAura::RunMoveLoop( Widget::MoveLoopEscapeBehavior escape_behavior) { if (!content_window_) return Widget::MOVE_LOOP_CANCELED; - return desktop_root_window_host_->RunMoveLoop(drag_offset, source, + return desktop_window_tree_host_->RunMoveLoop(drag_offset, source, escape_behavior); } void DesktopNativeWidgetAura::EndMoveLoop() { if (content_window_) - desktop_root_window_host_->EndMoveLoop(); + desktop_window_tree_host_->EndMoveLoop(); } void DesktopNativeWidgetAura::SetVisibilityChangedAnimationsEnabled( bool value) { if (content_window_) - desktop_root_window_host_->SetVisibilityChangedAnimationsEnabled(value); + desktop_window_tree_host_->SetVisibilityChangedAnimationsEnabled(value); } ui::NativeTheme* DesktopNativeWidgetAura::GetNativeTheme() const { @@ -895,7 +895,7 @@ ui::NativeTheme* DesktopNativeWidgetAura::GetNativeTheme() const { void DesktopNativeWidgetAura::OnRootViewLayout() const { if (content_window_) - desktop_root_window_host_->OnRootViewLayout(); + desktop_window_tree_host_->OnRootViewLayout(); } //////////////////////////////////////////////////////////////////////////////// @@ -1055,7 +1055,7 @@ void DesktopNativeWidgetAura::OnWindowActivated(aura::Window* gained_active, void DesktopNativeWidgetAura::OnWindowFocused(aura::Window* gained_focus, aura::Window* lost_focus) { if (content_window_ == gained_focus) { - desktop_root_window_host_->OnNativeWidgetFocus(); + desktop_window_tree_host_->OnNativeWidgetFocus(); native_widget_delegate_->OnNativeFocus(lost_focus); // If focus is moving from a descendant Window to |content_window_| then @@ -1065,7 +1065,7 @@ void DesktopNativeWidgetAura::OnWindowFocused(aura::Window* gained_focus, if (input_method) input_method->OnFocus(); } else if (content_window_ == lost_focus) { - desktop_root_window_host_->OnNativeWidgetBlur(); + desktop_window_tree_host_->OnNativeWidgetBlur(); native_widget_delegate_->OnNativeBlur( aura::client::GetFocusClient(content_window_)->GetFocusedWindow()); } @@ -1124,7 +1124,7 @@ void DesktopNativeWidgetAura::OnWindowTreeHostResized( // Don't update the bounds of the child layers when animating closed. If we // did it would force a paint, which we don't want. We don't want the paint // as we can't assume any of the children are valid. - if (desktop_root_window_host_->IsAnimatingClosed()) + if (desktop_window_tree_host_->IsAnimatingClosed()) return; gfx::Rect new_bounds = gfx::Rect(root->window()->bounds().size()); @@ -1163,7 +1163,7 @@ void DesktopNativeWidgetAura::InstallInputMethodEventFilter() { void DesktopNativeWidgetAura::UpdateWindowTransparency() { content_window_->SetTransparent( - desktop_root_window_host_->ShouldWindowContentsBeTransparent()); + desktop_window_tree_host_->ShouldWindowContentsBeTransparent()); } } // namespace views diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h index 85c88c9..473856c 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h @@ -258,7 +258,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura bool can_activate_; // Ownership passed to RootWindow on Init. - DesktopWindowTreeHost* desktop_root_window_host_; + DesktopWindowTreeHost* desktop_window_tree_host_; // Child of the root, contains |content_window_|. aura::Window* content_window_container_; diff --git a/ui/views/widget/desktop_aura/desktop_screen_win.cc b/ui/views/widget/desktop_aura/desktop_screen_win.cc index 99a5449..5c781a7 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_win.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_win.cc @@ -9,8 +9,8 @@ #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/gfx/display.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" #include "ui/views/widget/desktop_aura/desktop_screen.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" namespace { diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.cc b/ui/views/widget/desktop_aura/desktop_screen_x11.cc index 13198b4..271e4ec 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_x11.cc @@ -23,8 +23,8 @@ #include "ui/gfx/native_widget_types.h" #include "ui/gfx/screen.h" #include "ui/gfx/x/x11_types.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" #include "ui/views/widget/desktop_aura/desktop_screen.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" namespace { diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc index 69b6c6c..c54698d 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc @@ -9,7 +9,7 @@ #include "ui/gfx/display_observer.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host.h b/ui/views/widget/desktop_aura/desktop_window_tree_host.h index 066e82f..66fd475 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_H_ -#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_H_ +#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_H_ +#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_H_ #include "base/memory/scoped_ptr.h" #include "ui/aura/root_window.h" @@ -159,4 +159,4 @@ class VIEWS_EXPORT DesktopWindowTreeHost { } // namespace views -#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_H_ +#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_H_ diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_observer_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h index c8e8a48..544f205 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_observer_x11.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_OBSERVER_X11_H_ -#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_OBSERVER_X11_H_ +#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_OBSERVER_X11_H_ +#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_OBSERVER_X11_H_ #include "ui/views/views_export.h" @@ -25,5 +25,5 @@ class VIEWS_EXPORT DesktopWindowTreeHostObserverX11 { } // namespace views -#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_OBSERVER_X11_H_ +#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_OBSERVER_X11_H_ diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_ozone.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_ozone.cc index e327cb1..1a78a9a 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_ozone.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_ozone.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "ui/aura/window_tree_host.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host.h" #include "ui/views/widget/desktop_aura/desktop_factory_ozone.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc index 915e225..28fbf41 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" #include "base/win/metro.h" #include "third_party/skia/include/core/SkPath.h" diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h index 4eb7b34..ebb1836f 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ -#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ +#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_ +#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_ #include "ui/aura/client/animation_host.h" #include "ui/aura/window_tree_host.h" #include "ui/views/views_export.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" #include "ui/views/win/hwnd_message_handler_delegate.h" namespace aura { @@ -287,4 +287,4 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin } // namespace views -#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ +#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_ diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win_unittest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win_unittest.cc index 838d403..fb2e0b0 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_win_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" #include "ui/aura/root_window.h" #include "ui/views/test/views_test_base.h" @@ -47,7 +47,7 @@ TEST_F(DesktopWindowTreeHostWinTest, SaveFocusOnDeactivateFromHandleCreate) { DesktopNativeWidgetAura* desktop_native_widget_aura = new DesktopNativeWidgetAura(&widget); params.native_widget = desktop_native_widget_aura; - params.desktop_root_window_host = new TestDesktopWindowTreeHostWin( + params.desktop_window_tree_host = new TestDesktopWindowTreeHostWin( &widget, desktop_native_widget_aura); widget.Init(params); } diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc index 0003030..e42d967 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" #include <X11/extensions/shape.h> #include <X11/extensions/XInput2.h> @@ -45,7 +45,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host_observer_x11.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" #include "ui/views/widget/desktop_aura/x11_scoped_capture.h" diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h index c7184b2..80d0307 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ -#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ +#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ +#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ #include <X11/extensions/shape.h> #include <X11/Xlib.h> @@ -19,7 +19,7 @@ #include "ui/gfx/rect.h" #include "ui/gfx/x/x11_atom_cache.h" #include "ui/views/views_export.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" namespace gfx { class ImageSkia; @@ -305,4 +305,4 @@ private: } // namespace views -#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_X11_H_ +#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ diff --git a/ui/views/widget/desktop_aura/x11_desktop_handler.cc b/ui/views/widget/desktop_aura/x11_desktop_handler.cc index 0bb6a01..198b9c6 100644 --- a/ui/views/widget/desktop_aura/x11_desktop_handler.cc +++ b/ui/views/widget/desktop_aura/x11_desktop_handler.cc @@ -14,7 +14,7 @@ #if !defined(OS_CHROMEOS) #include "ui/views/ime/input_method.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" #endif namespace { diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.cc b/ui/views/widget/desktop_aura/x11_window_event_filter.cc index f9febf9..1336c46 100644 --- a/ui/views/widget/desktop_aura/x11_window_event_filter.cc +++ b/ui/views/widget/desktop_aura/x11_window_event_filter.cc @@ -17,7 +17,7 @@ #include "ui/events/event.h" #include "ui/events/event_utils.h" #include "ui/gfx/x/x11_types.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" #include "ui/views/widget/native_widget_aura.h" namespace { @@ -62,12 +62,12 @@ namespace views { X11WindowEventFilter::X11WindowEventFilter( aura::RootWindow* root_window, - DesktopWindowTreeHost* root_window_host) + DesktopWindowTreeHost* window_tree_host) : xdisplay_(gfx::GetXDisplay()), xwindow_(root_window->host()->GetAcceleratedWidget()), x_root_window_(DefaultRootWindow(xdisplay_)), atom_cache_(xdisplay_, kAtomsToCache), - root_window_host_(root_window_host), + window_tree_host_(window_tree_host), is_active_(false) { } @@ -113,10 +113,10 @@ void X11WindowEventFilter::OnMouseEvent(ui::MouseEvent* event) { // Our event is a double click in the caption area in a window that can be // maximized. We are responsible for dispatching this as a minimize/ // maximize on X11 (Windows converts this to min/max events for us). - if (root_window_host_->IsMaximized()) - root_window_host_->Restore(); + if (window_tree_host_->IsMaximized()) + window_tree_host_->Restore(); else - root_window_host_->Maximize(); + window_tree_host_->Maximize(); event->SetHandled(); return; } diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.h b/ui/views/widget/desktop_aura/x11_window_event_filter.h index 303de83..41f2454 100644 --- a/ui/views/widget/desktop_aura/x11_window_event_filter.h +++ b/ui/views/widget/desktop_aura/x11_window_event_filter.h @@ -33,7 +33,7 @@ class NativeWidgetAura; class VIEWS_EXPORT X11WindowEventFilter : public ui::EventHandler { public: X11WindowEventFilter(aura::RootWindow* root_window, - DesktopWindowTreeHost* root_window_host); + DesktopWindowTreeHost* window_tree_host); virtual ~X11WindowEventFilter(); // Changes whether borders are shown on this |root_window|. @@ -57,7 +57,7 @@ class VIEWS_EXPORT X11WindowEventFilter : public ui::EventHandler { ui::X11AtomCache atom_cache_; - DesktopWindowTreeHost* root_window_host_; + DesktopWindowTreeHost* window_tree_host_; // True if |xwindow_| is the current _NET_ACTIVE_WINDOW. bool is_active_; diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index d256497..3cb2f0e 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -45,15 +45,15 @@ #include "base/win/scoped_gdi_object.h" #include "base/win/win_util.h" #include "ui/base/l10n/l10n_util_win.h" -#include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" #endif #if defined(USE_X11) && !defined(OS_CHROMEOS) -#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" #endif #if !defined(OS_CHROMEOS) -#include "ui/views/widget/desktop_aura/desktop_root_window_host.h" +#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" #endif namespace views { diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index fc02afe..77cfde4 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -125,7 +125,7 @@ Widget::InitParams::InitParams() double_buffer(false), parent(NULL), native_widget(NULL), - desktop_root_window_host(NULL), + desktop_window_tree_host(NULL), top_level(false), layer_type(aura::WINDOW_LAYER_TEXTURED), context(NULL), @@ -150,7 +150,7 @@ Widget::InitParams::InitParams(Type type) double_buffer(false), parent(NULL), native_widget(NULL), - desktop_root_window_host(NULL), + desktop_window_tree_host(NULL), top_level(false), layer_type(aura::WINDOW_LAYER_TEXTURED), context(NULL), diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h index dd0c48d..f82e9de 100644 --- a/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h @@ -209,7 +209,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, // of the default one. // TODO(beng): Figure out if there's a better way to expose this, e.g. get // rid of NW subclasses and do this all via message handling. - DesktopWindowTreeHost* desktop_root_window_host; + DesktopWindowTreeHost* desktop_window_tree_host; // Whether this window is intended to be a toplevel window with no // attachment to any other window. (This may be a transient window if // |parent| is set.) diff --git a/ui/views/widget/widget_hwnd_utils.h b/ui/views/widget/widget_hwnd_utils.h index 2808bab..feb8478 100644 --- a/ui/views/widget/widget_hwnd_utils.h +++ b/ui/views/widget/widget_hwnd_utils.h @@ -9,7 +9,7 @@ #include "ui/views/widget/widget.h" -// Functions shared by native_widget_win.cc and desktop_root_window_host_win.cc: +// Functions shared by native_widget_win.cc and desktop_window_tree_host_win.cc: namespace views { class HWNDMessageHandler; diff --git a/win8/viewer/metro_viewer_process_host.cc b/win8/viewer/metro_viewer_process_host.cc index 90234bd..4fa5194 100644 --- a/win8/viewer/metro_viewer_process_host.cc +++ b/win8/viewer/metro_viewer_process_host.cc @@ -17,7 +17,7 @@ #include "base/win/scoped_comptr.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" -#include "ui/aura/remote_root_window_host_win.h" +#include "ui/aura/remote_window_tree_host_win.h" #include "ui/metro_viewer/metro_viewer_messages.h" #include "win8/viewer/metro_viewer_constants.h" |