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

Unified Diff: ash/shell.cc

Issue 160573002: Move root_window_host* in aura to window_tree_host*. (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/shell.h ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »
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 5a9f0242e9b7a19be92fd8b60451c18632342615..39daa14e04270c43b7af764a95954208d7c2d3b6 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();
« no previous file with comments | « ash/shell.h ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698