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

Side by Side Diff: mojo/services/view_manager/view_manager_init_service_impl.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_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_IMPL_H_ 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_IMPL_H_
6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_IMPL_H_ 6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h"
12 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" 11 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
13 #include "mojo/services/view_manager/connection_manager.h" 12 #include "mojo/services/view_manager/connection_manager.h"
14 #include "mojo/services/view_manager/view_manager_export.h" 13 #include "mojo/services/view_manager/view_manager_export.h"
15 14
16 namespace mojo { 15 namespace mojo {
17 16
18 class ApplicationConnection; 17 class ApplicationConnection;
19 18
20 namespace service { 19 namespace service {
21 20
(...skipping 12 matching lines...) Expand all
34 : public InterfaceImpl<ViewManagerInitService> { 33 : public InterfaceImpl<ViewManagerInitService> {
35 public: 34 public:
36 ViewManagerInitServiceImpl(ApplicationConnection* connection, 35 ViewManagerInitServiceImpl(ApplicationConnection* connection,
37 ViewManagerInitServiceContext* context); 36 ViewManagerInitServiceContext* context);
38 virtual ~ViewManagerInitServiceImpl(); 37 virtual ~ViewManagerInitServiceImpl();
39 38
40 private: 39 private:
41 // ViewManagerInitService overrides: 40 // ViewManagerInitService overrides:
42 virtual void Embed(const String& url, 41 virtual void Embed(const String& url,
43 ServiceProviderPtr service_provider, 42 ServiceProviderPtr service_provider,
44 const Callback<void(bool)>& callback) OVERRIDE; 43 const Callback<void(bool)>& callback) override;
45 44
46 ViewManagerInitServiceContext* context_; 45 ViewManagerInitServiceContext* context_;
47 46
48 DISALLOW_COPY_AND_ASSIGN(ViewManagerInitServiceImpl); 47 DISALLOW_COPY_AND_ASSIGN(ViewManagerInitServiceImpl);
49 }; 48 };
50 49
51 #if defined(OS_WIN) 50 #if defined(OS_WIN)
52 #pragma warning(pop) 51 #pragma warning(pop)
53 #endif 52 #endif
54 53
55 } // namespace service 54 } // namespace service
56 } // namespace mojo 55 } // namespace mojo
57 56
58 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_IMPL_H_ 57 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_INIT_SERVICE_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/services/view_manager/main.cc ('k') | mojo/services/view_manager/view_manager_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698