diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-24 23:54:41 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-24 23:54:41 +0000 |
| commit | d6fda20a54e8e85379ead6a21e2aab2003bd10a4 (patch) | |
| tree | c355482da7e0ec4a29cf7352eed2b4e2ca808bfd /chrome/browser/chromeos | |
| parent | 39363b2ad0e97ffcb885949a2528c8305da9647b (diff) | |
| download | chromium_src-d6fda20a54e8e85379ead6a21e2aab2003bd10a4.zip chromium_src-d6fda20a54e8e85379ead6a21e2aab2003bd10a4.tar.gz chromium_src-d6fda20a54e8e85379ead6a21e2aab2003bd10a4.tar.bz2 | |
Merge 143605 - grd file update for new 2x assets
The grd changes were made by http://pastie.org/4132407 (and
then cleaned up manually).
BUG=132910
TEST=Look at various icons (blocked plugins, "press tab to search", etc)
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/10642014
TBR=thakis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10656014
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@143848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/extensions/file_browser_notifications.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/chromeos/options/network_config_view.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/extensions/file_browser_notifications.cc b/chrome/browser/chromeos/extensions/file_browser_notifications.cc index 1674c3e..334b641 100644 --- a/chrome/browser/chromeos/extensions/file_browser_notifications.cc +++ b/chrome/browser/chromeos/extensions/file_browser_notifications.cc @@ -20,6 +20,7 @@ #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc index ae45121..cd95812 100644 --- a/chrome/browser/chromeos/options/network_config_view.cc +++ b/chrome/browser/chromeos/options/network_config_view.cc @@ -19,7 +19,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" |