diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 23:19:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 23:19:46 +0000 |
| commit | 42ce29d4f464b36ddaebefb6d6c33e7418e93141 (patch) | |
| tree | 0d0a4965d61ef1514dee70c9f2507529d8c5b178 /chrome/app | |
| parent | 0ffeb598304f119e2d3df70d47a592d2dbc722da (diff) | |
| download | chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.zip chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.gz chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.bz2 | |
Move ResourceBundle, DataPack to ui/base
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6263008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 7507f8b..6bf80cc 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -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 @@ int ChromeMain(int argc, char** argv) { // Initialize the Chrome path provider. app::RegisterPathProvider(); + ui::RegisterPathProvider(); chrome::RegisterPathProvider(); // Notice a user data directory override if any |