Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(454)

Side by Side Diff: chrome/browser/ui/webui/options/geolocation_options_handler.cc

Issue 21985002: Add Finch Checks to the State Machine (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SMLog
Patch Set: Quick Fixes Created 7 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h" 5 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "content/public/browser/web_ui.h" 10 #include "content/public/browser/web_ui.h"
11 11
12 namespace options { 12 namespace options {
13 13
14 GeolocationOptionsHandler::GeolocationOptionsHandler() {} 14 GeolocationOptionsHandler::GeolocationOptionsHandler() {}
15 15
16 GeolocationOptionsHandler::~GeolocationOptionsHandler() {} 16 GeolocationOptionsHandler::~GeolocationOptionsHandler() {}
17 17
18 void GeolocationOptionsHandler::GetLocalizedValues( 18 void GeolocationOptionsHandler::GetLocalizedValues(
19 DictionaryValue* localized_strings) { 19 DictionaryValue* localized_strings) {
20 } 20 }
21 21
22 void GeolocationOptionsHandler::InitializePage() { 22 void GeolocationOptionsHandler::InitializePage() {
23 DCHECK(web_ui()); 23 DCHECK(web_ui());
24 24
25 if ((base::FieldTrialList::FindFullName("GoogleNow") == "Enable") || 25 std::string enable_prefix("Enable");
26 std::string field_trial_result =
27 base::FieldTrialList::FindFullName("GoogleNow");
28 if ((field_trial_result.compare(
29 0,
30 enable_prefix.length(),
31 enable_prefix) == 0) ||
26 CommandLine::ForCurrentProcess()->HasSwitch( 32 CommandLine::ForCurrentProcess()->HasSwitch(
27 switches::kEnableGoogleNowIntegration)) { 33 switches::kEnableGoogleNowIntegration)) {
28 web_ui()->CallJavascriptFunction( 34 web_ui()->CallJavascriptFunction(
29 "GeolocationOptions.showGeolocationOption"); 35 "GeolocationOptions.showGeolocationOption");
30 } 36 }
31 } 37 }
32 38
33 } // namespace options 39 } // namespace options
34 40
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698