chrome/app/chrome_main.cc - Issue 6263008: Move ResourceBundle, DataPack to ui/base

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/app/chrome_main.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 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:

Index: chrome/app/chrome_main.cc

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

--- chrome/app/chrome_main.cc (revision 72000)

+++ chrome/app/chrome_main.cc (working copy)

@@ -4,7 +4,6 @@

#include "app/app_paths.h"

#include "app/app_switches.h"

-#include "app/resource_bundle.h"

#include "base/at_exit.h"

#include "base/command_line.h"

#include "base/debug/debugger.h"

@@ -36,6 +35,9 @@

#include "chrome/common/set_process_title.h"

#include "chrome/common/url_constants.h"

#include "ipc/ipc_switches.h"

+#include "ui/base/resource/resource_bundle.h"

+#include "ui/base/ui_base_paths.h"

+#include "ui/base/ui_base_switches.h"

#if defined(OS_WIN)

#include <algorithm>

@@ -717,6 +719,7 @@

// Initialize the Chrome path provider.

app::RegisterPathProvider();

+ ui::RegisterPathProvider();

chrome::RegisterPathProvider();

// Notice a user data directory override if any

« no previous file with comments | « app/test_suite.h ('k') | chrome/browser/alternate_nav_url_fetcher.cc » ('j') | no next file with comments »