Index: chrome/browser/ui/webui/options/geolocation_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options/geolocation_options_handler.cc b/chrome/browser/ui/webui/options/geolocation_options_handler.cc |
index 47ec77c4cf4ff6d47969e543943df68ae3a716d2..b4168ebe128be1d692a0ae6e904faf268ce0b661 100644 |
--- a/chrome/browser/ui/webui/options/geolocation_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/geolocation_options_handler.cc |
@@ -22,7 +22,10 @@ void GeolocationOptionsHandler::GetLocalizedValues( |
void GeolocationOptionsHandler::InitializePage() { |
DCHECK(web_ui()); |
- if ((base::FieldTrialList::FindFullName("GoogleNow") == "Enable") || |
+ std::string fieldTrialResult = |
+ base::FieldTrialList::FindFullName("GoogleNow"); |
+ if ((fieldTrialResult == "Enable") || |
+ (fieldTrialResult == "EnabledViaFlag") || |
CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnableGoogleNowIntegration)) { |
web_ui()->CallJavascriptFunction( |