chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc - Issue 271533004: Turning on MultiProfile by default for ChromeOS

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/extensions/api/networking_private/networking_private_api_chromeos.cc

Issue 271533004: Turning on MultiProfile by default for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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/profiles/profile_list_chromeos.cc ('k') | chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc

diff --git a/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc

index 685290e6ed11e19d517e0dc15b87c65f4be4fcd9..6275beaca3e8657ec9a1d8f8e37a4a8193c803fd 100644

--- a/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc

+++ b/chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc

@@ -7,12 +7,11 @@

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/callback.h"

-#include "base/command_line.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_process_platform_part_chromeos.h"

#include "chrome/browser/chromeos/net/network_portal_detector.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

-#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/extensions/api/networking_private.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/shill_manager_client.h"

@@ -62,13 +61,8 @@ ShillManagerClient::VerificationProperties ConvertVerificationProperties(

}

std::string GetUserIdHash(Profile* profile) {

- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles)) {

- return g_browser_process->platform_part()->

- profile_helper()->GetUserIdHashFromProfile(profile);

- } else {

- return g_browser_process->platform_part()->

- profile_helper()->active_user_id_hash();

- }

+ return g_browser_process->platform_part()->

+ profile_helper()->GetUserIdHashFromProfile(profile);

}

} // namespace