| Index: chrome/browser/chrome_browser_main_android.h
|
| diff --git a/chrome/browser/chrome_browser_main_android.h b/chrome/browser/chrome_browser_main_android.h
|
| index a20f09080bbfcde263fd908c5322ed8043e589b5..8f9d4ec2e72ca8628c6c5ba9babfa5e0de1fb99d 100644
|
| --- a/chrome/browser/chrome_browser_main_android.h
|
| +++ b/chrome/browser/chrome_browser_main_android.h
|
| @@ -8,6 +8,11 @@
|
| #include "chrome/browser/chrome_browser_main.h"
|
|
|
| class GoogleSearchCounterAndroid;
|
| +#if defined(USE_AURA)
|
| +namespace wm {
|
| +class WMTestHelper;
|
| +}
|
| +#endif
|
|
|
| namespace breakpad {
|
| class CrashDumpManager;
|
| @@ -19,8 +24,13 @@ class ChromeBrowserMainPartsAndroid : public ChromeBrowserMainParts {
|
| const content::MainFunctionParams& parameters);
|
| ~ChromeBrowserMainPartsAndroid() override;
|
|
|
| +#if defined(USE_AURA)
|
| + void InitAndroidAura();
|
| +#endif
|
| +
|
| // content::BrowserMainParts overrides.
|
| int PreCreateThreads() override;
|
| + void PreProfileInit() override;
|
| void PostProfileInit() override;
|
| void PreEarlyInitialization() override;
|
| void PreMainMessageLoopRun() override;
|
| @@ -33,6 +43,9 @@ class ChromeBrowserMainPartsAndroid : public ChromeBrowserMainParts {
|
| scoped_ptr<base::MessageLoop> main_message_loop_;
|
| scoped_ptr<breakpad::CrashDumpManager> crash_dump_manager_;
|
| scoped_ptr<GoogleSearchCounterAndroid> search_counter_;
|
| +#if defined(OS_ANDROID)
|
| + scoped_ptr<wm::WMTestHelper> wm_test_helper_;
|
| +#endif
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsAndroid);
|
| };
|
|
|