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

Unified Diff: components/mus/display_manager_factory.h

Issue 1351013002: Revert of Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « components/mus/display_manager_delegate.h ('k') | components/mus/event_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/display_manager_factory.h
diff --git a/components/mus/display_manager_factory.h b/components/mus/display_manager_factory.h
index e59424f542a7a320140db3959ba8e8dc7d698698..58b0ee084ece9cb24cc0b873a361e536b7c0296d 100644
--- a/components/mus/display_manager_factory.h
+++ b/components/mus/display_manager_factory.h
@@ -8,11 +8,11 @@
#include "components/mus/gles2/gpu_state.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h"
-namespace mus {
+namespace mojo {
class ApplicationImpl;
-} // namespace mus
+} // namespace mojo
-namespace mus {
+namespace view_manager {
class DisplayManager;
@@ -23,10 +23,10 @@
virtual DisplayManager* CreateDisplayManager(
bool is_headless,
mojo::ApplicationImpl* app_impl,
- const scoped_refptr<GpuState>& gpu_state,
- const scoped_refptr<SurfacesState>& surfaces_state) = 0;
+ const scoped_refptr<gles2::GpuState>& gpu_state,
+ const scoped_refptr<surfaces::SurfacesState>& surfaces_state) = 0;
};
-} // namespace mus
+} // namespace view_manager
#endif // COMPONENTS_MUS_DISPLAY_MANAGER_FACTORY_H_
« no previous file with comments | « components/mus/display_manager_delegate.h ('k') | components/mus/event_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698