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

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

Issue 617503003: Mojo: MOJO_OVERRIDE -> override in mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 2 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 MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_ 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_ 6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 const ServerView* relative_view, 90 const ServerView* relative_view,
91 OrderDirection direction, 91 OrderDirection direction,
92 bool originated_change); 92 bool originated_change);
93 void ProcessViewDeleted(const ViewId& view, bool originated_change); 93 void ProcessViewDeleted(const ViewId& view, bool originated_change);
94 void ProcessWillChangeViewVisibility(const ServerView* view, 94 void ProcessWillChangeViewVisibility(const ServerView* view,
95 bool originated_change); 95 bool originated_change);
96 96
97 // TODO(sky): move this to private section (currently can't because of 97 // TODO(sky): move this to private section (currently can't because of
98 // bindings). 98 // bindings).
99 // InterfaceImp overrides: 99 // InterfaceImp overrides:
100 virtual void OnConnectionError() MOJO_OVERRIDE; 100 virtual void OnConnectionError() override;
101 101
102 private: 102 private:
103 typedef std::map<ConnectionSpecificId, ServerView*> ViewMap; 103 typedef std::map<ConnectionSpecificId, ServerView*> ViewMap;
104 typedef base::hash_set<Id> ViewIdSet; 104 typedef base::hash_set<Id> ViewIdSet;
105 105
106 bool IsViewKnown(const ServerView* view) const; 106 bool IsViewKnown(const ServerView* view) const;
107 107
108 // These functions return true if the corresponding mojom function is allowed 108 // These functions return true if the corresponding mojom function is allowed
109 // for this connection. 109 // for this connection.
110 bool CanReorderView(const ServerView* view, 110 bool CanReorderView(const ServerView* view,
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 virtual void SetViewVisibility(Id view_id, 174 virtual void SetViewVisibility(Id view_id,
175 bool visible, 175 bool visible,
176 const Callback<void(bool)>& callback) OVERRIDE; 176 const Callback<void(bool)>& callback) OVERRIDE;
177 virtual void Embed(const String& url, 177 virtual void Embed(const String& url,
178 Id view_id, 178 Id view_id,
179 ServiceProviderPtr service_provider, 179 ServiceProviderPtr service_provider,
180 const Callback<void(bool)>& callback) OVERRIDE; 180 const Callback<void(bool)>& callback) OVERRIDE;
181 virtual void DispatchOnViewInputEvent(Id view_id, EventPtr event) OVERRIDE; 181 virtual void DispatchOnViewInputEvent(Id view_id, EventPtr event) OVERRIDE;
182 182
183 // InterfaceImpl: 183 // InterfaceImpl:
184 virtual void OnConnectionEstablished() MOJO_OVERRIDE; 184 virtual void OnConnectionEstablished() override;
185 185
186 // AccessPolicyDelegate: 186 // AccessPolicyDelegate:
187 virtual const base::hash_set<Id>& GetRootsForAccessPolicy() const OVERRIDE; 187 virtual const base::hash_set<Id>& GetRootsForAccessPolicy() const OVERRIDE;
188 virtual bool IsViewKnownForAccessPolicy( 188 virtual bool IsViewKnownForAccessPolicy(
189 const ServerView* view) const OVERRIDE; 189 const ServerView* view) const OVERRIDE;
190 virtual bool IsViewRootOfAnotherConnectionForAccessPolicy( 190 virtual bool IsViewRootOfAnotherConnectionForAccessPolicy(
191 const ServerView* view) const OVERRIDE; 191 const ServerView* view) const OVERRIDE;
192 192
193 ConnectionManager* connection_manager_; 193 ConnectionManager* connection_manager_;
194 194
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 }; 231 };
232 232
233 #if defined(OS_WIN) 233 #if defined(OS_WIN)
234 #pragma warning(pop) 234 #pragma warning(pop)
235 #endif 235 #endif
236 236
237 } // namespace service 237 } // namespace service
238 } // namespace mojo 238 } // namespace mojo
239 239
240 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_ 240 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/services/test_service/test_time_service_impl.h ('k') | mojo/services/window_manager/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698