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

Side by Side Diff: ui/views_content_client/views_content_main_delegate.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_ 5 #ifndef UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_
6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_ 6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/app/content_main_delegate.h" 10 #include "content/public/app/content_main_delegate.h"
11 #include "content/shell/common/shell_content_client.h" 11 #include "content/shell/common/shell_content_client.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 class ViewsContentBrowserClient; 15 class ViewsContentBrowserClient;
16 class ViewsContentClient; 16 class ViewsContentClient;
17 17
18 class ViewsContentMainDelegate : public content::ContentMainDelegate { 18 class ViewsContentMainDelegate : public content::ContentMainDelegate {
19 public: 19 public:
20 explicit ViewsContentMainDelegate(ViewsContentClient* views_content_client); 20 explicit ViewsContentMainDelegate(ViewsContentClient* views_content_client);
21 virtual ~ViewsContentMainDelegate(); 21 virtual ~ViewsContentMainDelegate();
22 22
23 // content::ContentMainDelegate implementation 23 // content::ContentMainDelegate implementation
24 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; 24 virtual bool BasicStartupComplete(int* exit_code) override;
25 virtual void PreSandboxStartup() OVERRIDE; 25 virtual void PreSandboxStartup() override;
26 virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; 26 virtual content::ContentBrowserClient* CreateContentBrowserClient() override;
27 27
28 private: 28 private:
29 scoped_ptr<ViewsContentBrowserClient> browser_client_; 29 scoped_ptr<ViewsContentBrowserClient> browser_client_;
30 content::ShellContentClient content_client_; 30 content::ShellContentClient content_client_;
31 ViewsContentClient* views_content_client_; 31 ViewsContentClient* views_content_client_;
32 32
33 DISALLOW_COPY_AND_ASSIGN(ViewsContentMainDelegate); 33 DISALLOW_COPY_AND_ASSIGN(ViewsContentMainDelegate);
34 }; 34 };
35 35
36 } // namespace ui 36 } // namespace ui
37 37
38 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_ 38 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/views_content_client/views_content_client_main_parts_mac.mm ('k') | ui/web_dialogs/test/test_web_contents_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698