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

Unified Diff: ash/mus/stub_context_factory.h

Issue 1676713002: ash/mash: Add a mus-client that sets up ash to provide the system ui for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix-cros-build Created 4 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/mus/shell_delegate_mus.cc ('k') | ash/mus/stub_context_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/stub_context_factory.h
diff --git a/blimp/engine/app/ui/blimp_ui_context_factory.h b/ash/mus/stub_context_factory.h
similarity index 66%
copy from blimp/engine/app/ui/blimp_ui_context_factory.h
copy to ash/mus/stub_context_factory.h
index 4028b54d42c36d4de912444732e4b58f199037c3..0693f28603ade9b2353e7d9dbaa7f143a46d8ee5 100644
--- a/blimp/engine/app/ui/blimp_ui_context_factory.h
+++ b/ash/mus/stub_context_factory.h
@@ -1,23 +1,25 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BLIMP_ENGINE_APP_UI_BLIMP_UI_CONTEXT_FACTORY_H_
-#define BLIMP_ENGINE_APP_UI_BLIMP_UI_CONTEXT_FACTORY_H_
-
-#include <stdint.h>
+#ifndef ASH_MUS_STUB_CONTEXT_FACTORY_H_
+#define ASH_MUS_STUB_CONTEXT_FACTORY_H_
#include "base/macros.h"
-#include "blimp/common/compositor/blimp_task_graph_runner.h"
+#include "base/memory/scoped_ptr.h"
#include "ui/compositor/compositor.h"
-namespace blimp {
-namespace engine {
+namespace cc {
+class SingleThreadTaskGraphRunner;
+}
+
+namespace ash {
+namespace sysui {
-class BlimpUiContextFactory : public ui::ContextFactory {
+class StubContextFactory : public ui::ContextFactory {
public:
- BlimpUiContextFactory();
- ~BlimpUiContextFactory() override;
+ StubContextFactory();
+ ~StubContextFactory() override;
private:
// ui::ContextFactory implementation.
@@ -39,12 +41,12 @@ class BlimpUiContextFactory : public ui::ContextFactory {
const gfx::Size& size) override;
uint32_t next_surface_id_namespace_;
- BlimpTaskGraphRunner task_graph_runner_;
+ scoped_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_;
- DISALLOW_COPY_AND_ASSIGN(BlimpUiContextFactory);
+ DISALLOW_COPY_AND_ASSIGN(StubContextFactory);
};
-} // namespace engine
-} // namespace blimp
+} // namespace sysui
+} // namespace ash
-#endif // BLIMP_ENGINE_APP_UI_BLIMP_UI_CONTEXT_FACTORY_H_
+#endif // ASH_MUS_STUB_CONTEXT_FACTORY_H_
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/mus/stub_context_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698