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

Side by Side Diff: ash/shell/content_client/shell_browser_main_parts.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « ash/shell/bubble.cc ('k') | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
6 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/browser/browser_main_parts.h" 10 #include "content/public/browser/browser_main_parts.h"
(...skipping 21 matching lines...) Expand all
32 class ShellDelegateImpl; 32 class ShellDelegateImpl;
33 class WindowWatcher; 33 class WindowWatcher;
34 34
35 class ShellBrowserMainParts : public content::BrowserMainParts { 35 class ShellBrowserMainParts : public content::BrowserMainParts {
36 public: 36 public:
37 explicit ShellBrowserMainParts( 37 explicit ShellBrowserMainParts(
38 const content::MainFunctionParams& parameters); 38 const content::MainFunctionParams& parameters);
39 virtual ~ShellBrowserMainParts(); 39 virtual ~ShellBrowserMainParts();
40 40
41 // Overridden from content::BrowserMainParts: 41 // Overridden from content::BrowserMainParts:
42 virtual void PreMainMessageLoopStart() OVERRIDE; 42 virtual void PreMainMessageLoopStart() override;
43 virtual void PostMainMessageLoopStart() OVERRIDE; 43 virtual void PostMainMessageLoopStart() override;
44 virtual void ToolkitInitialized() OVERRIDE; 44 virtual void ToolkitInitialized() override;
45 virtual void PreMainMessageLoopRun() OVERRIDE; 45 virtual void PreMainMessageLoopRun() override;
46 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 46 virtual bool MainMessageLoopRun(int* result_code) override;
47 virtual void PostMainMessageLoopRun() OVERRIDE; 47 virtual void PostMainMessageLoopRun() override;
48 48
49 content::ShellBrowserContext* browser_context() { 49 content::ShellBrowserContext* browser_context() {
50 return browser_context_.get(); 50 return browser_context_.get();
51 } 51 }
52 52
53 private: 53 private:
54 scoped_ptr<net::NetLog> net_log_; 54 scoped_ptr<net::NetLog> net_log_;
55 scoped_ptr<content::ShellBrowserContext> browser_context_; 55 scoped_ptr<content::ShellBrowserContext> browser_context_;
56 scoped_ptr<ash::shell::WindowWatcher> window_watcher_; 56 scoped_ptr<ash::shell::WindowWatcher> window_watcher_;
57 ShellDelegateImpl* delegate_; // owned by Shell 57 ShellDelegateImpl* delegate_; // owned by Shell
58 scoped_ptr<wm::WMState> wm_state_; 58 scoped_ptr<wm::WMState> wm_state_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); 60 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
61 }; 61 };
62 62
63 } // namespace shell 63 } // namespace shell
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_ 66 #endif // ASH_SHELL_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « ash/shell/bubble.cc ('k') | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698