From 16f799a44a9e871e2a5de8618ce1ed7d203414da Mon Sep 17 00:00:00 2001 From: "mukai@chromium.org" Date: Wed, 21 Mar 2012 02:28:23 +0000 Subject: 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 --- chrome/browser/chromeos/extensions/file_browser_event_router.cc | 7 +++++++ chrome/browser/chromeos/extensions/file_browser_event_router.h | 4 ++++ 2 files changed, 11 insertions(+) (limited to 'chrome/browser/chromeos') 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( 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; -- cgit v1.1