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/browser/ui/toolbar | |
| 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/browser/ui/toolbar')
| -rw-r--r-- | chrome/browser/ui/toolbar/back_forward_menu_model.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/toolbar/wrench_menu_model.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 3ceee8d..06e0841 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -7,7 +7,6 @@ #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_number_conversions.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/tab_contents/navigation_controller.h" @@ -21,6 +20,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/registry_controlled_domain.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" const int BackForwardMenuModel::kMaxHistoryItems = 12; diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 25ddc19..1783c50 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -8,7 +8,6 @@ #include <cmath> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/i18n/number_formatting.h" #include "base/string_number_conversions.h" @@ -36,6 +35,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/models/button_menu_item_model.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_LINUX) #include <gtk/gtk.h> |