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

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

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 3 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 #include <utility> 10 #include <utility>
(...skipping 1694 matching lines...) Expand 10 before | Expand all | Expand 10 after
1705 settings_utils::ShowManageSSLCertificates(web_ui()->GetWebContents()); 1705 settings_utils::ShowManageSSLCertificates(web_ui()->GetWebContents());
1706 } 1706 }
1707 #endif 1707 #endif
1708 1708
1709 #if defined(ENABLE_SERVICE_DISCOVERY) 1709 #if defined(ENABLE_SERVICE_DISCOVERY)
1710 1710
1711 void BrowserOptionsHandler::ShowCloudPrintDevicesPage( 1711 void BrowserOptionsHandler::ShowCloudPrintDevicesPage(
1712 const base::ListValue* args) { 1712 const base::ListValue* args) {
1713 content::RecordAction(UserMetricsAction("Options_CloudPrintDevicesPage")); 1713 content::RecordAction(UserMetricsAction("Options_CloudPrintDevicesPage"));
1714 // Navigate in current tab to devices page. 1714 // Navigate in current tab to devices page.
1715 OpenURLParams params( 1715 OpenURLParams params(GURL(chrome::kChromeUIDevicesURL), Referrer(),
1716 GURL(chrome::kChromeUIDevicesURL), Referrer(), 1716 WindowOpenDisposition::CURRENT_TAB,
1717 CURRENT_TAB, ui::PAGE_TRANSITION_LINK, false); 1717 ui::PAGE_TRANSITION_LINK, false);
1718 web_ui()->GetWebContents()->OpenURL(params); 1718 web_ui()->GetWebContents()->OpenURL(params);
1719 } 1719 }
1720 1720
1721 #endif 1721 #endif
1722 1722
1723 void BrowserOptionsHandler::SetHotwordAudioHistorySectionVisible( 1723 void BrowserOptionsHandler::SetHotwordAudioHistorySectionVisible(
1724 const base::string16& audio_history_state, 1724 const base::string16& audio_history_state,
1725 bool success, bool logging_enabled) { 1725 bool success, bool logging_enabled) {
1726 bool visible = logging_enabled && success; 1726 bool visible = logging_enabled && success;
1727 web_ui()->CallJavascriptFunctionUnsafe( 1727 web_ui()->CallJavascriptFunctionUnsafe(
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
2232 2232
2233 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2233 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2234 #if defined(OS_CHROMEOS) 2234 #if defined(OS_CHROMEOS)
2235 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2235 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2236 #else 2236 #else
2237 return true; 2237 return true;
2238 #endif 2238 #endif
2239 } 2239 }
2240 2240
2241 } // namespace options 2241 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698