OLD | NEW |
---|---|
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_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_ | 5 #ifndef CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_ |
6 #define CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_ | 6 #define CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_ |
7 | 7 |
8 #include "chrome/app/chrome_main_delegate.h" | 8 #include "chrome/app/chrome_main_delegate.h" |
9 #include "content/public/browser/browser_main_runner.h" | 9 #include "content/public/browser/browser_main_runner.h" |
10 | 10 |
(...skipping 11 matching lines...) Expand all Loading... | |
22 virtual ~ChromeMainDelegateAndroid(); | 22 virtual ~ChromeMainDelegateAndroid(); |
23 | 23 |
24 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; | 24 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; |
25 | 25 |
26 virtual void SandboxInitialized(const std::string& process_type) OVERRIDE; | 26 virtual void SandboxInitialized(const std::string& process_type) OVERRIDE; |
27 | 27 |
28 virtual int RunProcess( | 28 virtual int RunProcess( |
29 const std::string& process_type, | 29 const std::string& process_type, |
30 const content::MainFunctionParams& main_function_params) OVERRIDE; | 30 const content::MainFunctionParams& main_function_params) OVERRIDE; |
31 | 31 |
32 virtual void OVERRIDE EnableIncrementalStartup(bool enable); | |
Yaron
2013/07/25 00:05:17
Again, please move OVERRIDE to the end. Please ver
aberent
2013/07/26 20:36:54
Done. And verified throughout patch.
| |
33 | |
32 private: | 34 private: |
33 scoped_ptr<content::BrowserMainRunner> browser_runner_; | 35 scoped_ptr<content::BrowserMainRunner> browser_runner_; |
34 | 36 |
37 bool incremental_startup_enabled_; | |
38 | |
35 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateAndroid); | 39 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateAndroid); |
36 }; | 40 }; |
37 | 41 |
38 #endif // CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_ | 42 #endif // CHROME_APP_ANDROID_CHROME_MAIN_DELEGATE_ANDROID_H_ |
OLD | NEW |