chrome/browser/chrome_browser_main.cc - Issue 11819050: Revert 175890: actually, looks like we want this to also help move chromeos webui pages out of src/…

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/chrome_browser_main.cc

Issue 11819050: Revert 175890: actually, looks like we want this to also help move chromeos webui pages out of src/… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 11 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

Index: chrome/browser/chrome_browser_main.cc

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

--- chrome/browser/chrome_browser_main.cc (revision 175970)

+++ chrome/browser/chrome_browser_main.cc (working copy)

@@ -92,6 +92,7 @@

#include "chrome/browser/ui/uma_browsing_activity_observer.h"

#include "chrome/browser/ui/user_data_dir_dialog.h"

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

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

#include "chrome/common/child_process_logging.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

@@ -1391,6 +1392,9 @@

g_browser_process->profile_manager()->GetLastOpenedProfiles();

#endif

+ content::WebUIControllerFactory::RegisterFactory(

+ ChromeWebUIControllerFactory::GetInstance());

if (browser_creator_->Start(parsed_command_line(), FilePath(),

profile_, last_opened_profiles, &result_code)) {

#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))

« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »