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/cookies_tree_model.cc | |
| 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/cookies_tree_model.cc')
| -rw-r--r-- | chrome/browser/cookies_tree_model.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index f662eab..b9be8a5 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -18,6 +18,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #include "grit/ui_resources.h" #include "net/base/registry_controlled_domain.h" #include "net/cookies/cookie_monster.h" |