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

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

Issue 275853002: Revert of Wires up view manager to an actual display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/services/view_manager/root_node_manager.cc ('k') | mojo/services/view_manager/root_view_manager.cc » ('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.h
diff --git a/mojo/services/view_manager/root_view_manager.h b/mojo/services/view_manager/root_view_manager.h
deleted file mode 100644
index 049faa81415c445ed74197c17d1b1404d71d3bb3..0000000000000000000000000000000000000000
--- a/mojo/services/view_manager/root_view_manager.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2014 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 MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_
-#define MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_
-
-#include <map>
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "mojo/public/cpp/gles2/gles2.h"
-#include "mojo/services/view_manager/view_manager_export.h"
-
-namespace aura {
-namespace client {
-class WindowTreeClient;
-}
-class WindowTreeHost;
-}
-
-namespace gfx {
-class Screen;
-}
-
-namespace mojo {
-
-class Shell;
-
-namespace services {
-namespace view_manager {
-
-class RootNodeManager;
-
-// RootViewManager binds the root node to an actual display.
-class MOJO_VIEW_MANAGER_EXPORT RootViewManager {
- public:
- RootViewManager(Shell* shell, RootNodeManager* root_node);
- virtual ~RootViewManager();
-
- // See description above field for details.
- bool in_setup() const { return in_setup_; }
-
- private:
- void OnCompositorCreated();
-
- Shell* shell_;
- RootNodeManager* root_node_manager_;
-
- GLES2Initializer gles_initializer_;
-
- // Returns true if adding the root node's window to |window_tree_host_|.
- bool in_setup_;
-
- scoped_ptr<gfx::Screen> screen_;
- scoped_ptr<aura::WindowTreeHost> window_tree_host_;
- scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
-
- DISALLOW_COPY_AND_ASSIGN(RootViewManager);
-};
-
-} // namespace view_manager
-} // namespace services
-} // namespace mojo
-
-#endif // MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_
« no previous file with comments | « mojo/services/view_manager/root_node_manager.cc ('k') | mojo/services/view_manager/root_view_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698