Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2832)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 184903003: Window ownership -> WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | ui/aura/window_tree_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 8ed71fe2d43a369a2116155c88ddbf974d5040e3..d462df25f2a955f58fbd8077c87faa38bcbb9869 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -860,7 +860,7 @@ void Shell::Init() {
AddShellObserver(overlay_filter_.get());
input_method_filter_.reset(new views::corewm::InputMethodEventFilter(
- root_window->GetDispatcher()->host()->GetAcceleratedWidget()));
+ root_window->GetHost()->GetAcceleratedWidget()));
AddPreTargetHandler(input_method_filter_.get());
accelerator_filter_.reset(new internal::AcceleratorFilter);
@@ -960,7 +960,7 @@ void Shell::Init() {
// initialize controller/delegates above when initializing the
// primary root window controller.
internal::RootWindowController::CreateForPrimaryDisplay(
- root_window->GetDispatcher()->host());
+ root_window->GetHost());
display_controller_->InitSecondaryDisplays();
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | ui/aura/window_tree_host.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698