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

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

Issue 2076763004: Use ENABLE_DISABLE_VALUE_TYPE for storage-manager switch and enable it by default on dev. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update histograms.xml Created 4 years, 6 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 "enableExperimentalAccessibilityFeatures", 737 "enableExperimentalAccessibilityFeatures",
738 base::CommandLine::ForCurrentProcess()->HasSwitch( 738 base::CommandLine::ForCurrentProcess()->HasSwitch(
739 chromeos::switches::kEnableExperimentalAccessibilityFeatures)); 739 chromeos::switches::kEnableExperimentalAccessibilityFeatures));
740 740
741 chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get(); 741 chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get();
742 bool allow_bluetooth = true; 742 bool allow_bluetooth = true;
743 cros_settings->GetBoolean(chromeos::kAllowBluetooth, &allow_bluetooth); 743 cros_settings->GetBoolean(chromeos::kAllowBluetooth, &allow_bluetooth);
744 values->SetBoolean("allowBluetooth", allow_bluetooth); 744 values->SetBoolean("allowBluetooth", allow_bluetooth);
745 745
746 values->SetBoolean("enableStorageManager", 746 values->SetBoolean("enableStorageManager",
747 base::CommandLine::ForCurrentProcess()->HasSwitch( 747 !base::CommandLine::ForCurrentProcess()->HasSwitch(
748 chromeos::switches::kEnableStorageManager)); 748 chromeos::switches::kDisableStorageManager));
749 #endif 749 #endif
750 } 750 }
751 751
752 #if defined(ENABLE_PRINT_PREVIEW) 752 #if defined(ENABLE_PRINT_PREVIEW)
753 void BrowserOptionsHandler::RegisterCloudPrintValues( 753 void BrowserOptionsHandler::RegisterCloudPrintValues(
754 base::DictionaryValue* values) { 754 base::DictionaryValue* values) {
755 values->SetString("cloudPrintOptionLabel", 755 values->SetString("cloudPrintOptionLabel",
756 l10n_util::GetStringFUTF16( 756 l10n_util::GetStringFUTF16(
757 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL, 757 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
758 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); 758 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
(...skipping 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after
2192 2192
2193 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2193 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2194 #if defined(OS_CHROMEOS) 2194 #if defined(OS_CHROMEOS)
2195 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2195 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2196 #else 2196 #else
2197 return true; 2197 return true;
2198 #endif 2198 #endif
2199 } 2199 }
2200 2200
2201 } // namespace options 2201 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698