chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc - Issue 13865012: Change GetProfileToUse method from Profile to content::BrowserContext

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc

Issue 13865012: Change GetProfileToUse method from Profile to content::BrowserContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: trybots Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h ('k') | chrome/browser/chromeos/extensions/networking_private_event_router_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc

diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc

index 992c03499eb1c7229b163f0b8324f2750abf9401..fba99de0d66a9acadf68af6a74d231e497e9decb 100644

--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc

+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc

@@ -7,6 +7,7 @@

#include "chrome/browser/chromeos/drive/drive_system_service.h"

#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h"

#include "chrome/browser/extensions/extension_system_factory.h"

+#include "chrome/browser/profiles/incognito_helpers.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_dependency_manager.h"

@@ -39,11 +40,10 @@ ProfileKeyedService* FileBrowserPrivateAPIFactory::BuildServiceInstanceFor(

return new FileBrowserPrivateAPI(static_cast<Profile*>(profile));

}

-bool FileBrowserPrivateAPIFactory::ServiceHasOwnInstanceInIncognito() const {

- // 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;

+content::BrowserContext* FileBrowserPrivateAPIFactory::GetBrowserContextToUse(

+ content::BrowserContext* context) const {

+ // Explicitly and always allow this router in guest login mode.

+ return chrome::GetBrowserContextOwnInstanceInIncognito(context);

}

bool FileBrowserPrivateAPIFactory::ServiceIsCreatedWithProfile() const {