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

Side by Side Diff: components/view_manager/view_manager_app.h

Issue 1166123005: Removes ServiceProviders from ViewManager::Embed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use is_headless rather than check for browser. Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_APP_H_ 5 #ifndef COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_APP_H_
6 #define COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_APP_H_ 6 #define COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_APP_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "components/view_manager/connection_manager_delegate.h" 9 #include "components/view_manager/connection_manager_delegate.h"
10 #include "components/view_manager/gles2/gpu_impl.h" 10 #include "components/view_manager/gles2/gpu_impl.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 void Initialize(mojo::ApplicationImpl* app) override; 42 void Initialize(mojo::ApplicationImpl* app) override;
43 bool ConfigureIncomingConnection( 43 bool ConfigureIncomingConnection(
44 mojo::ApplicationConnection* connection) override; 44 mojo::ApplicationConnection* connection) override;
45 45
46 // ConnectionManagerDelegate: 46 // ConnectionManagerDelegate:
47 void OnLostConnectionToWindowManager() override; 47 void OnLostConnectionToWindowManager() override;
48 ClientConnection* CreateClientConnectionForEmbedAtView( 48 ClientConnection* CreateClientConnectionForEmbedAtView(
49 ConnectionManager* connection_manager, 49 ConnectionManager* connection_manager,
50 mojo::InterfaceRequest<mojo::ViewManagerService> service_request, 50 mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
51 mojo::ConnectionSpecificId creator_id, 51 mojo::ConnectionSpecificId creator_id,
52 const std::string& creator_url,
53 mojo::URLRequestPtr request, 52 mojo::URLRequestPtr request,
54 const ViewId& root_id) override; 53 const ViewId& root_id) override;
55 ClientConnection* CreateClientConnectionForEmbedAtView( 54 ClientConnection* CreateClientConnectionForEmbedAtView(
56 ConnectionManager* connection_manager, 55 ConnectionManager* connection_manager,
57 mojo::InterfaceRequest<mojo::ViewManagerService> service_request, 56 mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
58 mojo::ConnectionSpecificId creator_id, 57 mojo::ConnectionSpecificId creator_id,
59 const std::string& creator_url,
60 const ViewId& root_id, 58 const ViewId& root_id,
61 mojo::ViewManagerClientPtr view_manager_client) override; 59 mojo::ViewManagerClientPtr view_manager_client) override;
62 60
63 // mojo::InterfaceFactory<mojo::ViewManagerService>: 61 // mojo::InterfaceFactory<mojo::ViewManagerService>:
64 void Create( 62 void Create(
65 mojo::ApplicationConnection* connection, 63 mojo::ApplicationConnection* connection,
66 mojo::InterfaceRequest<mojo::ViewManagerService> request) override; 64 mojo::InterfaceRequest<mojo::ViewManagerService> request) override;
67 65
68 // mojo::InterfaceFactory<mojo::ViewManagerRoot>: 66 // mojo::InterfaceFactory<mojo::ViewManagerRoot>:
69 void Create(mojo::ApplicationConnection* connection, 67 void Create(mojo::ApplicationConnection* connection,
(...skipping 13 matching lines...) Expand all
83 scoped_refptr<gles2::GpuState> gpu_state_; 81 scoped_refptr<gles2::GpuState> gpu_state_;
84 scoped_ptr<ui::PlatformEventSource> event_source_; 82 scoped_ptr<ui::PlatformEventSource> event_source_;
85 bool is_headless_; 83 bool is_headless_;
86 84
87 DISALLOW_COPY_AND_ASSIGN(ViewManagerApp); 85 DISALLOW_COPY_AND_ASSIGN(ViewManagerApp);
88 }; 86 };
89 87
90 } // namespace view_manager 88 } // namespace view_manager
91 89
92 #endif // COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_APP_H_ 90 #endif // COMPONENTS_VIEW_MANAGER_VIEW_MANAGER_APP_H_
OLDNEW
« no previous file with comments | « components/view_manager/test_change_tracker.cc ('k') | components/view_manager/view_manager_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698