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_frame | |
| 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_frame')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 1 | ||||
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 2341575..26b9436 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -30,6 +30,7 @@ #include "chrome_frame/navigation_constraints.h" #include "chrome_frame/simple_resource_loader.h" #include "chrome_frame/utils.h" +#include "ui/base/ui_base_switches.h" #ifdef NDEBUG int64 kAutomationServerReasonableLaunchDelay = 1000; // in milliseconds diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index c48af62..7091021 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -9,7 +9,6 @@ #include <exdisp.h> #include "app/app_paths.h" -#include "app/resource_bundle.h" #include "app/win/scoped_com_initializer.h" #include "base/command_line.h" #include "base/debug/debugger.h" @@ -42,6 +41,8 @@ #include "chrome_frame/test/win_event_receiver.h" #include "chrome_frame/utils.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" namespace { @@ -193,6 +194,7 @@ void FakeExternalTab::Initialize() { chrome::RegisterPathProvider(); app::RegisterPathProvider(); + ui::RegisterPathProvider(); // Load Chrome.dll as our resource dll. FilePath dll; |