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

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

Issue 1789543003: MD Settings: move AdvancedOptionsUtilities to a settings-accessible place (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 10
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 #include "content/public/common/page_zoom.h" 98 #include "content/public/common/page_zoom.h"
99 #include "extensions/browser/extension_registry.h" 99 #include "extensions/browser/extension_registry.h"
100 #include "google_apis/gaia/gaia_auth_util.h" 100 #include "google_apis/gaia/gaia_auth_util.h"
101 #include "google_apis/gaia/google_service_auth_error.h" 101 #include "google_apis/gaia/google_service_auth_error.h"
102 #include "policy/policy_constants.h" 102 #include "policy/policy_constants.h"
103 #include "third_party/skia/include/core/SkBitmap.h" 103 #include "third_party/skia/include/core/SkBitmap.h"
104 #include "ui/base/l10n/l10n_util.h" 104 #include "ui/base/l10n/l10n_util.h"
105 #include "ui/base/webui/web_ui_util.h" 105 #include "ui/base/webui/web_ui_util.h"
106 106
107 #if !defined(OS_CHROMEOS) 107 #if !defined(OS_CHROMEOS)
108 #include "chrome/browser/ui/webui/options/advanced_options_utils.h" 108 #include "chrome/browser/ui/webui/settings_utils.h"
109 #endif 109 #endif
110 110
111 #if defined(OS_CHROMEOS) 111 #if defined(OS_CHROMEOS)
112 #include "ash/ash_switches.h" 112 #include "ash/ash_switches.h"
113 #include "ash/desktop_background/user_wallpaper_delegate.h" 113 #include "ash/desktop_background/user_wallpaper_delegate.h"
114 #include "ash/shell.h" 114 #include "ash/shell.h"
115 #include "ash/system/chromeos/devicetype_utils.h" 115 #include "ash/system/chromeos/devicetype_utils.h"
116 #include "chrome/browser/browser_process_platform_part.h" 116 #include "chrome/browser/browser_process_platform_part.h"
117 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 117 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
118 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 118 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
(...skipping 1502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1621 1621
1622 void BrowserOptionsHandler::HandleRequestProfilesInfo( 1622 void BrowserOptionsHandler::HandleRequestProfilesInfo(
1623 const base::ListValue* args) { 1623 const base::ListValue* args) {
1624 SendProfilesInfo(); 1624 SendProfilesInfo();
1625 } 1625 }
1626 1626
1627 #if !defined(OS_CHROMEOS) 1627 #if !defined(OS_CHROMEOS)
1628 void BrowserOptionsHandler::ShowNetworkProxySettings( 1628 void BrowserOptionsHandler::ShowNetworkProxySettings(
1629 const base::ListValue* args) { 1629 const base::ListValue* args) {
1630 content::RecordAction(UserMetricsAction("Options_ShowProxySettings")); 1630 content::RecordAction(UserMetricsAction("Options_ShowProxySettings"));
1631 AdvancedOptionsUtilities::ShowNetworkProxySettings( 1631 settings_utils::ShowNetworkProxySettings(web_ui()->GetWebContents());
1632 web_ui()->GetWebContents());
1633 } 1632 }
1634 #endif 1633 #endif
1635 1634
1636 #if defined(OS_WIN) || defined(OS_MACOSX) 1635 #if defined(OS_WIN) || defined(OS_MACOSX)
1637 void BrowserOptionsHandler::ShowManageSSLCertificates( 1636 void BrowserOptionsHandler::ShowManageSSLCertificates(
1638 const base::ListValue* args) { 1637 const base::ListValue* args) {
1639 content::RecordAction(UserMetricsAction("Options_ManageSSLCertificates")); 1638 content::RecordAction(UserMetricsAction("Options_ManageSSLCertificates"));
1640 AdvancedOptionsUtilities::ShowManageSSLCertificates( 1639 settings_utils::ShowManageSSLCertificates(web_ui()->GetWebContents());
1641 web_ui()->GetWebContents());
1642 } 1640 }
1643 #endif 1641 #endif
1644 1642
1645 #if defined(ENABLE_SERVICE_DISCOVERY) 1643 #if defined(ENABLE_SERVICE_DISCOVERY)
1646 1644
1647 void BrowserOptionsHandler::ShowCloudPrintDevicesPage( 1645 void BrowserOptionsHandler::ShowCloudPrintDevicesPage(
1648 const base::ListValue* args) { 1646 const base::ListValue* args) {
1649 content::RecordAction(UserMetricsAction("Options_CloudPrintDevicesPage")); 1647 content::RecordAction(UserMetricsAction("Options_CloudPrintDevicesPage"));
1650 // Navigate in current tab to devices page. 1648 // Navigate in current tab to devices page.
1651 OpenURLParams params( 1649 OpenURLParams params(
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
2126 2124
2127 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2125 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2128 #if defined(OS_CHROMEOS) 2126 #if defined(OS_CHROMEOS)
2129 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2127 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2130 #else 2128 #else
2131 return true; 2129 return true;
2132 #endif 2130 #endif
2133 } 2131 }
2134 2132
2135 } // namespace options 2133 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698