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

Side by Side Diff: mojo/services/view_manager/view_manager_init_connection.h

Issue 328873002: Renames view manager Connect methods to Embed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mispelling 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 unified diff | Download patch | Annotate | Revision Log
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 MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_CONNECTION_H_ 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_CONNECTION_H_
6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_CONNECTION_H_ 6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_CONNECTION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 28 matching lines...) Expand all
39 39
40 private: 40 private:
41 struct ConnectParams { 41 struct ConnectParams {
42 ConnectParams(); 42 ConnectParams();
43 ~ConnectParams(); 43 ~ConnectParams();
44 44
45 std::string url; 45 std::string url;
46 Callback<void(bool)> callback; 46 Callback<void(bool)> callback;
47 }; 47 };
48 48
49 void MaybeConnect(const std::string& url, 49 void MaybeEmbedRoot(const std::string& url,
50 const Callback<void(bool)>& callback); 50 const Callback<void(bool)>& callback);
51 51
52 // IViewManagerInit overrides: 52 // IViewManagerInit overrides:
53 virtual void Connect(const String& url, 53 virtual void EmbedRoot(const String& url,
54 const Callback<void(bool)>& callback) OVERRIDE; 54 const Callback<void(bool)>& callback) OVERRIDE;
55 55
56 // RootViewManagerDelegate overrides: 56 // RootViewManagerDelegate overrides:
57 virtual void OnRootViewManagerWindowTreeHostCreated() OVERRIDE; 57 virtual void OnRootViewManagerWindowTreeHostCreated() OVERRIDE;
58 58
59 ServiceProvider* service_provider_; 59 ServiceProvider* service_provider_;
60 60
61 RootNodeManager root_node_manager_; 61 RootNodeManager root_node_manager_;
62 62
63 // Parameters passed to Connect(). If non-null Connect() has been invoked. 63 // Parameters passed to Connect(). If non-null Connect() has been invoked.
64 scoped_ptr<ConnectParams> connect_params_; 64 scoped_ptr<ConnectParams> connect_params_;
65 65
66 bool is_tree_host_ready_; 66 bool is_tree_host_ready_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(ViewManagerInitConnection); 68 DISALLOW_COPY_AND_ASSIGN(ViewManagerInitConnection);
69 }; 69 };
70 70
71 #if defined(OS_WIN) 71 #if defined(OS_WIN)
72 #pragma warning(pop) 72 #pragma warning(pop)
73 #endif 73 #endif
74 74
75 } // namespace service 75 } // namespace service
76 } // namespace view_manager 76 } // namespace view_manager
77 } // namespace mojo 77 } // namespace mojo
78 78
79 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_CONNECTION_H_ 79 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_CONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698