chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 114913002: Merge 240486 "Implement the spring charger replacement UI and ad..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 114913002: Merge 240486 "Implement the spring charger replacement UI and ad..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1734/src/

Patch Set: Created 7 years 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_win.cc ('k') | chrome/browser/ui/webui/chromeos/charger_replacement_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

===================================================================

--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc (revision 240512)

+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc (working copy)

@@ -99,6 +99,7 @@

#if defined(OS_CHROMEOS)

#include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h"

+#include "chrome/browser/ui/webui/chromeos/charger_replacement_ui.h"

#include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"

#include "chrome/browser/ui/webui/chromeos/cryptohome_ui.h"

#include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h"

@@ -387,6 +388,8 @@

#if defined(OS_CHROMEOS)

if (url.host() == chrome::kChromeUIBluetoothPairingHost)

return &NewWebUI<chromeos::BluetoothPairingUI>;

+ if (url.host() == chrome::kChromeUIChargerReplacementHost)

+ return &NewWebUI<chromeos::ChargerReplacementUI>;

if (url.host() == chrome::kChromeUIChooseMobileNetworkHost)

return &NewWebUI<chromeos::ChooseMobileNetworkUI>;

if (url.host() == chrome::kChromeUICryptohomeHost)