diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 05:19:32 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 05:19:32 +0000 |
| commit | 056ce05075d1eccc591007b553acf1a77c9984da (patch) | |
| tree | 0120aab5ede38d13baf801b95b18f2c073657721 /apps | |
| parent | 21d32ecf459324e55d24a84a4fc89d9166fa4fc8 (diff) | |
| download | chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.zip chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.tar.gz chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.tar.bz2 | |
Rename RootWindow -> WindowEventDispatcher.
http://crbug.com/308843
R=sky@chromium.org
Review URL: https://codereview.chromium.org/172743002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/shell/browser/shell_browser_main_parts.cc | 14 | ||||
| -rw-r--r-- | apps/shell/browser/shell_browser_main_parts.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc index 6532351..924eb39 100644 --- a/apps/shell/browser/shell_browser_main_parts.cc +++ b/apps/shell/browser/shell_browser_main_parts.cc @@ -136,7 +136,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { // TODO(jamescook): For demo purposes create a window with a WebView just // to ensure that the content module is properly initialized. webview_window_.reset(CreateWebViewWindow(browser_context_.get(), - wm_test_helper_->root_window()->window())); + wm_test_helper_->dispatcher()->window())); webview_window_->Show(); } } @@ -162,7 +162,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { } void ShellBrowserMainParts::OnWindowTreeHostCloseRequested( - const aura::RootWindow* root) { + const aura::WindowEventDispatcher* dispatcher) { base::MessageLoop::current()->PostTask(FROM_HERE, base::MessageLoop::QuitClosure()); } @@ -176,16 +176,16 @@ void ShellBrowserMainParts::CreateRootWindow() { // Set up basic pieces of views::corewm. wm_test_helper_.reset(new wm::WMTestHelper(gfx::Size(800, 600))); // Ensure the X window gets mapped. - wm_test_helper_->root_window()->host()->Show(); + wm_test_helper_->dispatcher()->host()->Show(); // Watch for the user clicking the close box. - wm_test_helper_->root_window()->AddRootWindowObserver(this); + wm_test_helper_->dispatcher()->AddRootWindowObserver(this); } void ShellBrowserMainParts::DestroyRootWindow() { // We should close widget before destroying root window. webview_window_.reset(); - wm_test_helper_->root_window()->RemoveRootWindowObserver(this); - wm_test_helper_->root_window()->PrepareForShutdown(); + wm_test_helper_->dispatcher()->RemoveRootWindowObserver(this); + wm_test_helper_->dispatcher()->PrepareForShutdown(); wm_test_helper_.reset(); ui::ShutdownInputMethodForTesting(); } @@ -193,7 +193,7 @@ void ShellBrowserMainParts::DestroyRootWindow() { void ShellBrowserMainParts::CreateViewsDelegate() { DCHECK(!views::ViewsDelegate::views_delegate); views::ViewsDelegate::views_delegate = - new ShellViewsDelegate(wm_test_helper_->root_window()->window()); + new ShellViewsDelegate(wm_test_helper_->dispatcher()->window()); } void ShellBrowserMainParts::DestroyViewsDelegate() { diff --git a/apps/shell/browser/shell_browser_main_parts.h b/apps/shell/browser/shell_browser_main_parts.h index 3a97ba7..f9fae2e 100644 --- a/apps/shell/browser/shell_browser_main_parts.h +++ b/apps/shell/browser/shell_browser_main_parts.h @@ -69,8 +69,8 @@ class ShellBrowserMainParts : public content::BrowserMainParts, virtual void PostMainMessageLoopRun() OVERRIDE; // aura::RootWindowObserver overrides: - virtual void OnWindowTreeHostCloseRequested(const aura::RootWindow* root) - OVERRIDE; + virtual void OnWindowTreeHostCloseRequested( + const aura::WindowEventDispatcher* dispatcher) OVERRIDE; private: // Creates the window that hosts the apps. |