chrome/browser/chromeos/extensions/networking_private_api.cc - Issue 14581006: [cros mp] Load profiles from /home/chronos/u-[$hash], add GetUserIdHashFromProfile()

Unified Diff: chrome/browser/chromeos/extensions/networking_private_api.cc

Issue 14581006: [cros mp] Load profiles from /home/chronos/u-[$hash], add GetUserIdHashFromProfile() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: networking_private_api - use user_id_hash only if --multi-profiles switch is passed Created 7 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/app_mode/kiosk_app_launcher.cc ('k') | chrome/browser/chromeos/extensions/networking_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/networking_private_api.cc

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

index 850fbddb3904b1aeacfb8f1de4d1c01eb71ea0f8..4a1a858e3e7d1556bec8dae586063caef0fe3996 100644

--- a/chrome/browser/chromeos/extensions/networking_private_api.cc

+++ b/chrome/browser/chromeos/extensions/networking_private_api.cc

@@ -7,8 +7,12 @@

#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/profiles/profile_helper.h"

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

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

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

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

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/shill_manager_client.h"

@@ -101,14 +105,15 @@ bool NetworkingPrivateGetManagedPropertiesFunction::RunImpl() {

api::GetManagedProperties::Params::Create(*args_);

EXTENSION_FUNCTION_VALIDATE(params);

- // The profile of the requesting browser.

- Profile* requesting_profile = profile();

- // TODO(pneubeck): Use ProfileHelper to obtain the userhash, once it provides

- // that functionality. crbug/238623.

- std::string userhash = requesting_profile->GetPath().BaseName().value();

+ // User ID hash presence is only enforced when multi-profiles are turned on.

+ std::string user_id_hash;

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

+ user_id_hash = g_browser_process->platform_part()->

+ profile_helper()->GetUserIdHashFromProfile(profile());

+ }

pneubeck (no reviews) 2013/05/08 17:55:26 The else case should fallback on active_user_id_ha

Nikita (slow) 2013/05/09 20:00:54 Done.

ManagedNetworkConfigurationHandler::Get()->GetManagedProperties(

- userhash,

+ user_id_hash,

params->network_guid, // service path

base::Bind(&NetworkingPrivateGetManagedPropertiesFunction::Success,

this),