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

Unified Diff: mojo/aura/context_factory_mojo.h

Issue 314113011: Moves common view_manager related aura files to mojo/aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweaks 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/aura/DEPS ('k') | mojo/aura/context_factory_mojo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/aura/context_factory_mojo.h
diff --git a/mojo/examples/aura_demo/context_factory_view_manager.h b/mojo/aura/context_factory_mojo.h
similarity index 62%
rename from mojo/examples/aura_demo/context_factory_view_manager.h
rename to mojo/aura/context_factory_mojo.h
index c74da163b18844815d756ee7f5333a7bbc526fb1..800afa7bd6d458480f80980816f70d49cca56e56 100644
--- a/mojo/examples/aura_demo/context_factory_view_manager.h
+++ b/mojo/aura/context_factory_mojo.h
@@ -2,22 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_EXAMPLES_AURA_DEMO_CONTEXT_FACTORY_VIEW_MANAGER_H_
-#define MOJO_EXAMPLES_AURA_DEMO_CONTEXT_FACTORY_VIEW_MANAGER_H_
+#ifndef MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
+#define MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
#include "ui/compositor/compositor.h"
namespace mojo {
-namespace view_manager {
-class IViewManager;
-}
-namespace examples {
-class ContextFactoryViewManager : public ui::ContextFactory {
+class ContextFactoryMojo : public ui::ContextFactory {
public:
- ContextFactoryViewManager(view_manager::IViewManager* view_manager,
- uint32_t view_id);
- virtual ~ContextFactoryViewManager();
+ ContextFactoryMojo();
+ virtual ~ContextFactoryMojo();
private:
// ContextFactory:
@@ -35,14 +30,11 @@ class ContextFactoryViewManager : public ui::ContextFactory {
virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE;
virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE;
- view_manager::IViewManager* view_manager_;
- const uint32_t view_id_;
scoped_ptr<cc::SharedBitmapManager> shared_bitmap_manager_;
- DISALLOW_COPY_AND_ASSIGN(ContextFactoryViewManager);
+ DISALLOW_COPY_AND_ASSIGN(ContextFactoryMojo);
};
-} // namespace examples
} // namespace mojo
-#endif // MOJO_EXAMPLES_AURA_DEMO_CONTEXT_FACTORY_VIEW_MANAGER_H_
+#endif // MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
« no previous file with comments | « mojo/aura/DEPS ('k') | mojo/aura/context_factory_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698