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

Side by Side Diff: mojo/services/window_manager/window_manager_app.h

Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove compiler_specific.h inclusions 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_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ 5 #ifndef MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
6 #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ 6 #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // Overridden from ViewManagerDelegate: 100 // Overridden from ViewManagerDelegate:
101 virtual void OnEmbed(ViewManager* view_manager, 101 virtual void OnEmbed(ViewManager* view_manager,
102 View* root, 102 View* root,
103 ServiceProviderImpl* exported_services, 103 ServiceProviderImpl* exported_services,
104 scoped_ptr<ServiceProvider> imported_services) override; 104 scoped_ptr<ServiceProvider> imported_services) override;
105 virtual void OnViewManagerDisconnected(ViewManager* view_manager) override; 105 virtual void OnViewManagerDisconnected(ViewManager* view_manager) override;
106 106
107 // Overridden from WindowManagerDelegate: 107 // Overridden from WindowManagerDelegate:
108 virtual void Embed( 108 virtual void Embed(
109 const String& url, 109 const String& url,
110 InterfaceRequest<ServiceProvider> service_provider) OVERRIDE; 110 InterfaceRequest<ServiceProvider> service_provider) override;
111 virtual void DispatchEvent(EventPtr event) OVERRIDE; 111 virtual void DispatchEvent(EventPtr event) override;
112 112
113 // Overridden from ViewObserver: 113 // Overridden from ViewObserver:
114 virtual void OnTreeChanged( 114 virtual void OnTreeChanged(
115 const ViewObserver::TreeChangeParams& params) override; 115 const ViewObserver::TreeChangeParams& params) override;
116 virtual void OnViewDestroyed(View* view) override; 116 virtual void OnViewDestroyed(View* view) override;
117 virtual void OnViewBoundsChanged(View* view, 117 virtual void OnViewBoundsChanged(View* view,
118 const gfx::Rect& old_bounds, 118 const gfx::Rect& old_bounds,
119 const gfx::Rect& new_bounds) override; 119 const gfx::Rect& new_bounds) override;
120 120
121 // Overridden from WindowTreeHostMojoDelegate: 121 // Overridden from WindowTreeHostMojoDelegate:
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 ViewIdToWindowMap view_id_to_window_map_; 162 ViewIdToWindowMap view_id_to_window_map_;
163 163
164 scoped_ptr<DummyDelegate> dummy_delegate_; 164 scoped_ptr<DummyDelegate> dummy_delegate_;
165 165
166 DISALLOW_COPY_AND_ASSIGN(WindowManagerApp); 166 DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
167 }; 167 };
168 168
169 } // namespace mojo 169 } // namespace mojo
170 170
171 #endif // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ 171 #endif // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
OLDNEW
« no previous file with comments | « mojo/services/view_manager/window_manager_access_policy.h ('k') | mojo/services/window_manager/window_manager_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698