chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 919183002: Move chromeos::device_event_log into components.

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 919183002: Move chromeos::device_event_log into components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move device_event_log::Initialize call to BrowserProcessImpl. Created 5 years, 10 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/browser_process_impl.cc ('K') | « chrome/browser/resources/device_log_ui/device_log_ui.js ('k') | chrome/browser/ui/webui/chromeos/device_log_ui.h » ('j') | chromeos/dbus/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

index 35a9b450c089b2ec2c7a987ce8a2fd7e52a55deb..0bbbcceb379b5b6bab18ea3e9cdca06137f77213 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -24,6 +24,7 @@

#include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"

#include "chrome/browser/ui/webui/copresence_ui.h"

#include "chrome/browser/ui/webui/crashes_ui.h"

+#include "chrome/browser/ui/webui/device_log_ui.h"

#include "chrome/browser/ui/webui/domain_reliability_internals_ui.h"

#include "chrome/browser/ui/webui/downloads_ui.h"

#include "chrome/browser/ui/webui/flags_ui.h"

@@ -111,7 +112,6 @@

#include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_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/device_log_ui.h"

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

#include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"

#include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h"

@@ -297,6 +297,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

return &NewWebUI<ConstrainedWebDialogUI>;

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

return &NewWebUI<CrashesUI>;

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

+ return &NewWebUI<chromeos::DeviceLogUI>;

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

return &NewWebUI<DomainReliabilityInternalsUI>;

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

@@ -412,8 +414,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

return &NewWebUI<chromeos::ChooseMobileNetworkUI>;

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

return &NewWebUI<chromeos::CryptohomeUI>;

- if (url.host() == chrome::kChromeUIDeviceLogHost)

- return &NewWebUI<chromeos::DeviceLogUI>;

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

return &NewWebUI<chromeos::DriveInternalsUI>;

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