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

Unified Diff: mojo/services/view_manager/root_view_manager.cc

Issue 341953002: Clean up WTH creation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 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 | « mojo/mojo_services.gypi ('k') | mojo/services/view_manager/screen_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/view_manager/root_view_manager.cc
diff --git a/mojo/services/view_manager/root_view_manager.cc b/mojo/services/view_manager/root_view_manager.cc
index 0434076c7c91e177de569c97dbc3aef7b63d200f..0bcdbfbb20e4764ba06ae40e02d091fad48b9cd1 100644
--- a/mojo/services/view_manager/root_view_manager.cc
+++ b/mojo/services/view_manager/root_view_manager.cc
@@ -6,10 +6,10 @@
#include "base/auto_reset.h"
#include "base/scoped_observer.h"
-#include "mojo/aura/screen_mojo.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/services/view_manager/root_node_manager.h"
#include "mojo/services/view_manager/root_view_manager_delegate.h"
+#include "mojo/services/view_manager/screen_impl.h"
#include "mojo/services/view_manager/window_tree_host_impl.h"
#include "ui/aura/client/default_capture_client.h"
#include "ui/aura/client/focus_change_observer.h"
@@ -114,7 +114,7 @@ RootViewManager::RootViewManager(ServiceProvider* service_provider,
: delegate_(delegate),
root_node_manager_(root_node),
in_setup_(false) {
- screen_.reset(ScreenMojo::Create());
+ screen_.reset(ScreenImpl::Create());
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
NativeViewportPtr viewport;
ConnectToService(service_provider,
« no previous file with comments | « mojo/mojo_services.gypi ('k') | mojo/services/view_manager/screen_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698