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

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

Issue 380893005: Add an option page for searching and managing resources and permissions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Last pass. Created 6 years, 5 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 (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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 CommandLine::ForCurrentProcess()->HasSwitch( 611 CommandLine::ForCurrentProcess()->HasSwitch(
612 chromeos::switches::kEnableConsumerManagement)); 612 chromeos::switches::kEnableConsumerManagement));
613 613
614 RegisterTitle(values, "thirdPartyImeConfirmOverlay", 614 RegisterTitle(values, "thirdPartyImeConfirmOverlay",
615 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE); 615 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE);
616 #endif 616 #endif
617 617
618 values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser()); 618 values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser());
619 619
620 values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings()); 620 values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings());
621
622 values->SetBoolean("websiteSettingsManagerEnabled",
623 CommandLine::ForCurrentProcess()->HasSwitch(
624 switches::kEnableWebsiteSettingsManager));
621 } 625 }
622 626
623 #if defined(ENABLE_FULL_PRINTING) 627 #if defined(ENABLE_FULL_PRINTING)
624 void BrowserOptionsHandler::RegisterCloudPrintValues( 628 void BrowserOptionsHandler::RegisterCloudPrintValues(
625 base::DictionaryValue* values) { 629 base::DictionaryValue* values) {
626 values->SetString("cloudPrintOptionLabel", 630 values->SetString("cloudPrintOptionLabel",
627 l10n_util::GetStringFUTF16( 631 l10n_util::GetStringFUTF16(
628 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL, 632 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
629 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); 633 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
630 } 634 }
(...skipping 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after
1800 extension = extensions::GetExtensionOverridingProxy( 1804 extension = extensions::GetExtensionOverridingProxy(
1801 Profile::FromWebUI(web_ui())); 1805 Profile::FromWebUI(web_ui()));
1802 AppendExtensionData("proxy", extension, &extension_controlled); 1806 AppendExtensionData("proxy", extension, &extension_controlled);
1803 1807
1804 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1808 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1805 extension_controlled); 1809 extension_controlled);
1806 #endif // defined(OS_WIN) 1810 #endif // defined(OS_WIN)
1807 } 1811 }
1808 1812
1809 } // namespace options 1813 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698