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

Side by Side Diff: chrome/browser/chrome_browser_main.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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 (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 CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 5 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
6 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 6 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_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 "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 virtual void AddParts(ChromeBrowserMainExtraParts* parts); 53 virtual void AddParts(ChromeBrowserMainExtraParts* parts);
54 54
55 protected: 55 protected:
56 explicit ChromeBrowserMainParts( 56 explicit ChromeBrowserMainParts(
57 const content::MainFunctionParams& parameters); 57 const content::MainFunctionParams& parameters);
58 58
59 // content::BrowserMainParts overrides. 59 // content::BrowserMainParts overrides.
60 // These are called in-order by content::BrowserMainLoop. 60 // These are called in-order by content::BrowserMainLoop.
61 // Each stage calls the same stages in any ChromeBrowserMainExtraParts added 61 // Each stage calls the same stages in any ChromeBrowserMainExtraParts added
62 // with AddParts() from ChromeContentBrowserClient::CreateBrowserMainParts. 62 // with AddParts() from ChromeContentBrowserClient::CreateBrowserMainParts.
63 virtual void PreEarlyInitialization() OVERRIDE; 63 virtual void PreEarlyInitialization() override;
64 virtual void PostEarlyInitialization() OVERRIDE; 64 virtual void PostEarlyInitialization() override;
65 virtual void ToolkitInitialized() OVERRIDE; 65 virtual void ToolkitInitialized() override;
66 virtual void PreMainMessageLoopStart() OVERRIDE; 66 virtual void PreMainMessageLoopStart() override;
67 virtual void PostMainMessageLoopStart() OVERRIDE; 67 virtual void PostMainMessageLoopStart() override;
68 virtual int PreCreateThreads() OVERRIDE; 68 virtual int PreCreateThreads() override;
69 virtual void PreMainMessageLoopRun() OVERRIDE; 69 virtual void PreMainMessageLoopRun() override;
70 virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; 70 virtual bool MainMessageLoopRun(int* result_code) override;
71 virtual void PostMainMessageLoopRun() OVERRIDE; 71 virtual void PostMainMessageLoopRun() override;
72 virtual void PostDestroyThreads() OVERRIDE; 72 virtual void PostDestroyThreads() override;
73 73
74 // Additional stages for ChromeBrowserMainExtraParts. These stages are called 74 // Additional stages for ChromeBrowserMainExtraParts. These stages are called
75 // in order from PreMainMessageLoopRun(). See implementation for details. 75 // in order from PreMainMessageLoopRun(). See implementation for details.
76 virtual void PreProfileInit(); 76 virtual void PreProfileInit();
77 virtual void PostProfileInit(); 77 virtual void PostProfileInit();
78 virtual void PreBrowserStart(); 78 virtual void PreBrowserStart();
79 virtual void PostBrowserStart(); 79 virtual void PostBrowserStart();
80 80
81 // Displays a warning message that we can't find any locale data files. 81 // Displays a warning message that we can't find any locale data files.
82 virtual void ShowMissingLocaleMessageBox() = 0; 82 virtual void ShowMissingLocaleMessageBox() = 0;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 bool restart_last_session_; 183 bool restart_last_session_;
184 184
185 // Tests can set this to true to disable restricting cookie access in the 185 // Tests can set this to true to disable restricting cookie access in the
186 // network stack, as this can only be done once. 186 // network stack, as this can only be done once.
187 static bool disable_enforcing_cookie_policies_for_tests_; 187 static bool disable_enforcing_cookie_policies_for_tests_;
188 188
189 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts); 189 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
190 }; 190 };
191 191
192 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_ 192 #endif // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
OLDNEW
« no previous file with comments | « chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698