Commit 08b5d522 authored by Oscar Johansson's avatar Oscar Johansson Committed by Commit Bot

Resolve namespace scope issue (chrome/browser/ui)

When building using Jumbo files gets merged.
This results in a conflict with the namespace prefs in
webui/media_router/media_router_webui_message_handler.cc.
This commit solves this by specifying that the global
namespace should be used, by adding the "::" prefix.

Bug: 773275
Change-Id: I504984ef83db8cc23561f1f16ce99cdbee89721e
Reviewed-on: https://chromium-review.googlesource.com/1102419Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#567665}
parent 030bb2f4
...@@ -610,7 +610,7 @@ void MediaRouterWebUIMessageHandler::OnAcknowledgeFirstRunFlow( ...@@ -610,7 +610,7 @@ void MediaRouterWebUIMessageHandler::OnAcknowledgeFirstRunFlow(
const base::ListValue* args) { const base::ListValue* args) {
DVLOG(1) << "OnAcknowledgeFirstRunFlow"; DVLOG(1) << "OnAcknowledgeFirstRunFlow";
Profile::FromWebUI(web_ui())->GetPrefs()->SetBoolean( Profile::FromWebUI(web_ui())->GetPrefs()->SetBoolean(
prefs::kMediaRouterFirstRunFlowAcknowledged, true); ::prefs::kMediaRouterFirstRunFlowAcknowledged, true);
bool enabled_cloud_services = false; bool enabled_cloud_services = false;
// Do not set the relevant cloud services prefs if the user was not shown // Do not set the relevant cloud services prefs if the user was not shown
...@@ -621,9 +621,9 @@ void MediaRouterWebUIMessageHandler::OnAcknowledgeFirstRunFlow( ...@@ -621,9 +621,9 @@ void MediaRouterWebUIMessageHandler::OnAcknowledgeFirstRunFlow(
} }
PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs(); PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
pref_service->SetBoolean(prefs::kMediaRouterEnableCloudServices, pref_service->SetBoolean(::prefs::kMediaRouterEnableCloudServices,
enabled_cloud_services); enabled_cloud_services);
pref_service->SetBoolean(prefs::kMediaRouterCloudServicesPrefSet, true); pref_service->SetBoolean(::prefs::kMediaRouterCloudServicesPrefSet, true);
} }
void MediaRouterWebUIMessageHandler::OnActOnIssue(const base::ListValue* args) { void MediaRouterWebUIMessageHandler::OnActOnIssue(const base::ListValue* args) {
...@@ -1068,13 +1068,13 @@ void MediaRouterWebUIMessageHandler::MaybeUpdateFirstRunFlowData() { ...@@ -1068,13 +1068,13 @@ void MediaRouterWebUIMessageHandler::MaybeUpdateFirstRunFlowData() {
PrefService* pref_service = profile->GetPrefs(); PrefService* pref_service = profile->GetPrefs();
bool first_run_flow_acknowledged = bool first_run_flow_acknowledged =
pref_service->GetBoolean(prefs::kMediaRouterFirstRunFlowAcknowledged); pref_service->GetBoolean(::prefs::kMediaRouterFirstRunFlowAcknowledged);
bool show_cloud_pref = false; bool show_cloud_pref = false;
// Cloud services preference is shown if user is logged in. If the user // Cloud services preference is shown if user is logged in. If the user
// enables sync after acknowledging the first run flow, this is treated as // enables sync after acknowledging the first run flow, this is treated as
// the user opting into Google services, including cloud services, if the // the user opting into Google services, including cloud services, if the
// browser is a Chrome branded build. // browser is a Chrome branded build.
if (!pref_service->GetBoolean(prefs::kMediaRouterCloudServicesPrefSet)) { if (!pref_service->GetBoolean(::prefs::kMediaRouterCloudServicesPrefSet)) {
identity::IdentityManager* identity_manager = identity::IdentityManager* identity_manager =
IdentityManagerFactory::GetForProfile(profile); IdentityManagerFactory::GetForProfile(profile);
if (identity_manager && identity_manager->HasPrimaryAccount()) { if (identity_manager && identity_manager->HasPrimaryAccount()) {
...@@ -1083,8 +1083,10 @@ void MediaRouterWebUIMessageHandler::MaybeUpdateFirstRunFlowData() { ...@@ -1083,8 +1083,10 @@ void MediaRouterWebUIMessageHandler::MaybeUpdateFirstRunFlowData() {
// enabled, turn on cloud services. // enabled, turn on cloud services.
if (first_run_flow_acknowledged && if (first_run_flow_acknowledged &&
ProfileSyncServiceFactory::GetForProfile(profile)->IsSyncActive()) { ProfileSyncServiceFactory::GetForProfile(profile)->IsSyncActive()) {
pref_service->SetBoolean(prefs::kMediaRouterEnableCloudServices, true); pref_service->SetBoolean(::prefs::kMediaRouterEnableCloudServices,
pref_service->SetBoolean(prefs::kMediaRouterCloudServicesPrefSet, true); true);
pref_service->SetBoolean(::prefs::kMediaRouterCloudServicesPrefSet,
true);
// Return early since the first run flow won't be surfaced. // Return early since the first run flow won't be surfaced.
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment