summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 02:28:23 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 02:28:23 +0000
commit16f799a44a9e871e2a5de8618ce1ed7d203414da (patch)
treeea415df56dfdbbbe8df7ce088cde730f2d9f8a7a
parent90ee092309f6b1b1b2c30d7f2b1cf61116bc757c (diff)
downloadchromium_src-16f799a44a9e871e2a5de8618ce1ed7d203414da.zip
chromium_src-16f799a44a9e871e2a5de8618ce1ed7d203414da.tar.gz
chromium_src-16f799a44a9e871e2a5de8618ce1ed7d203414da.tar.bz2
Allow FileBrowserEventRouter in Guest login.
BUG=chromium-os:28001 TEST=manually Review URL: https://chromiumcodereview.appspot.com/9721019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127880 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/extensions/file_browser_event_router.cc7
-rw-r--r--chrome/browser/chromeos/extensions/file_browser_event_router.h4
2 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index ec1014b..5118643 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -608,3 +608,10 @@ FileBrowserEventRouterFactory::BuildServiceInstanceFor(Profile* profile) const {
return scoped_refptr<RefcountedProfileKeyedService>(
new FileBrowserEventRouter(profile));
}
+
+bool FileBrowserEventRouterFactory::ServiceHasOwnInstanceInIncognito() {
+ // Explicitly and always allow this router in guest login mode. see
+ // chrome/browser/profiles/profile_keyed_base_factory.h comment
+ // for the details.
+ return true;
+}
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.h b/chrome/browser/chromeos/extensions/file_browser_event_router.h
index 4ccdc8c..08f3e1d 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.h
@@ -179,6 +179,10 @@ class FileBrowserEventRouterFactory
// Returns the FileBrowserEventRouterFactory instance.
static FileBrowserEventRouterFactory* GetInstance();
+ protected:
+ // ProfileKeyedBasedFactory overrides:
+ virtual bool ServiceHasOwnInstanceInIncognito() OVERRIDE;
+
private:
friend struct DefaultSingletonTraits<FileBrowserEventRouterFactory>;