diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 23:29:04 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 23:29:04 +0000 |
| commit | d3aa614545bb56e61c9a4344143d5b1e9e83cb57 (patch) | |
| tree | b3eeddc867d182d1f82b39e82ad7acb0b1f7f429 | |
| parent | a8e2effec63c91a4c82f6d172ad8ca91017823db (diff) | |
| download | chromium_src-d3aa614545bb56e61c9a4344143d5b1e9e83cb57.zip chromium_src-d3aa614545bb56e61c9a4344143d5b1e9e83cb57.tar.gz chromium_src-d3aa614545bb56e61c9a4344143d5b1e9e83cb57.tar.bz2 | |
Fix build after https://codereview.chromium.org/13865012/
TBR=joi
BUG=227219
Review URL: https://codereview.chromium.org/14941004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198237 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/shell_window_registry.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/extensions/shell_window_registry.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/extensions/shell_window_registry.cc b/chrome/browser/extensions/shell_window_registry.cc index 6d64374..0f03e16 100644 --- a/chrome/browser/extensions/shell_window_registry.cc +++ b/chrome/browser/extensions/shell_window_registry.cc @@ -4,6 +4,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/shell_window_registry.h" +#include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/extensions/native_app_window.h" @@ -257,8 +258,9 @@ bool ShellWindowRegistry::Factory::ServiceIsNULLWhileTesting() const { return false; } -bool ShellWindowRegistry::Factory::ServiceRedirectedInIncognito() const { - return true; +content::BrowserContext* ShellWindowRegistry::Factory::GetBrowserContextToUse( + content::BrowserContext* context) const { + return chrome::GetBrowserContextRedirectedInIncognito(context); } } // namespace extensions diff --git a/chrome/browser/extensions/shell_window_registry.h b/chrome/browser/extensions/shell_window_registry.h index 1da54a0..062b2ad 100644 --- a/chrome/browser/extensions/shell_window_registry.h +++ b/chrome/browser/extensions/shell_window_registry.h @@ -118,7 +118,8 @@ class ShellWindowRegistry : public ProfileKeyedService { content::BrowserContext* profile) const OVERRIDE; virtual bool ServiceIsCreatedWithProfile() const OVERRIDE; virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; - virtual bool ServiceRedirectedInIncognito() const OVERRIDE; + virtual content::BrowserContext* GetBrowserContextToUse( + content::BrowserContext* context) const OVERRIDE; }; Profile* profile_; |