diff options
| author | oritm@chromium.org <oritm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 21:43:18 +0000 |
|---|---|---|
| committer | oritm@chromium.org <oritm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 21:43:18 +0000 |
| commit | 00d801524b66f6ccccb8ce0d4ce72de2f39c744c (patch) | |
| tree | 3c2546e68bd0152240110e9bb7feb45c648c05e1 /chrome/browser/chrome_browser_main_extra_parts_aura.h | |
| parent | 58dd344ef68f40f313d8c9c736b177960803ab19 (diff) | |
| download | chromium_src-00d801524b66f6ccccb8ce0d4ce72de2f39c744c.zip chromium_src-00d801524b66f6ccccb8ce0d4ce72de2f39c744c.tar.gz chromium_src-00d801524b66f6ccccb8ce0d4ce72de2f39c744c.tar.bz2 | |
Merge 112651 - Revert "chromeos: move screen lock handling to power manager client"
This reverts commit f9f5f14c3ecf810409509b92a0b694850050e74e.
Revert "Move chromeos specific code to ChromeBrowserMainPartsChromeos"
This reverts commit 922cff9cd081e3ae327b52d3cc6bd8423307dee0.
Revert "chromeos: remove power manager EXPECTs from login_browsertest"
This reverts commit 0a9298b6333f5a373ddd316978f0aa469ef20ce7.
Review URL: http://codereview.chromium.org/8774035
TBR=sque@chromium.org
Review URL: http://codereview.chromium.org/8772056
git-svn-id: svn://svn.chromium.org/chrome/branches/958/src@112794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_extra_parts_aura.h')
| -rw-r--r-- | chrome/browser/chrome_browser_main_extra_parts_aura.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.h b/chrome/browser/chrome_browser_main_extra_parts_aura.h index b8846ee..2af4a18 100644 --- a/chrome/browser/chrome_browser_main_extra_parts_aura.h +++ b/chrome/browser/chrome_browser_main_extra_parts_aura.h @@ -13,7 +13,7 @@ class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts { public: ChromeBrowserMainExtraPartsAura(); - virtual void PreProfileInit() OVERRIDE; + virtual void PostBrowserProcessInit() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura); |