summaryrefslogtreecommitdiffstats
path: root/chrome/app/theme
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-29 08:38:55 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-29 08:38:55 +0000
commit65fe7eac155dd9e5c204ae46a2bbef4fbbe5e6c3 (patch)
treeefbd48fbb53015e6942a3f1dbb7e629626347d25 /chrome/app/theme
parent221d56e1ae44baca6d9a3a044eaa7b4bb042a897 (diff)
downloadchromium_src-65fe7eac155dd9e5c204ae46a2bbef4fbbe5e6c3.zip
chromium_src-65fe7eac155dd9e5c204ae46a2bbef4fbbe5e6c3.tar.gz
chromium_src-65fe7eac155dd9e5c204ae46a2bbef4fbbe5e6c3.tar.bz2
Revert 286120 "Move omnibox icons to components (2/2)"
> Move omnibox icons to components (2/2) > > To stop depending on resources under chrome/ from AutocompleteMatch. > > Move 3 icons from chrome/ to components/. > > BUG=388510 > TEST=build > R=blundell@chromium.org, oshima@chromium.org, pkasting@chromium.org > > Review URL: https://codereview.chromium.org/415973005 TBR=hashimoto@chromium.org Review URL: https://codereview.chromium.org/424073002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme')
-rw-r--r--chrome/app/theme/default_100_percent/common/omnibox_extension_app.pngbin0 -> 382 bytes
-rw-r--r--chrome/app/theme/default_100_percent/common/omnibox_http.pngbin0 -> 124 bytes
-rw-r--r--chrome/app/theme/default_100_percent/common/omnibox_search.pngbin0 -> 223 bytes
-rw-r--r--chrome/app/theme/default_200_percent/common/omnibox_extension_app.pngbin0 -> 671 bytes
-rw-r--r--chrome/app/theme/default_200_percent/common/omnibox_http.pngbin0 -> 245 bytes
-rw-r--r--chrome/app/theme/default_200_percent/common/omnibox_search.pngbin0 -> 449 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd3
7 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/theme/default_100_percent/common/omnibox_extension_app.png b/chrome/app/theme/default_100_percent/common/omnibox_extension_app.png
new file mode 100644
index 0000000..a5cbcbfc
--- /dev/null
+++ b/chrome/app/theme/default_100_percent/common/omnibox_extension_app.png
Binary files differ
diff --git a/chrome/app/theme/default_100_percent/common/omnibox_http.png b/chrome/app/theme/default_100_percent/common/omnibox_http.png
new file mode 100644
index 0000000..c8031f3
--- /dev/null
+++ b/chrome/app/theme/default_100_percent/common/omnibox_http.png
Binary files differ
diff --git a/chrome/app/theme/default_100_percent/common/omnibox_search.png b/chrome/app/theme/default_100_percent/common/omnibox_search.png
new file mode 100644
index 0000000..e271f75
--- /dev/null
+++ b/chrome/app/theme/default_100_percent/common/omnibox_search.png
Binary files differ
diff --git a/chrome/app/theme/default_200_percent/common/omnibox_extension_app.png b/chrome/app/theme/default_200_percent/common/omnibox_extension_app.png
new file mode 100644
index 0000000..091a0f9
--- /dev/null
+++ b/chrome/app/theme/default_200_percent/common/omnibox_extension_app.png
Binary files differ
diff --git a/chrome/app/theme/default_200_percent/common/omnibox_http.png b/chrome/app/theme/default_200_percent/common/omnibox_http.png
new file mode 100644
index 0000000..ebf6b48
--- /dev/null
+++ b/chrome/app/theme/default_200_percent/common/omnibox_http.png
Binary files differ
diff --git a/chrome/app/theme/default_200_percent/common/omnibox_search.png b/chrome/app/theme/default_200_percent/common/omnibox_search.png
new file mode 100644
index 0000000..46bc104
--- /dev/null
+++ b/chrome/app/theme/default_200_percent/common/omnibox_search.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 699b9bc..edcb9a5 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -523,8 +523,10 @@
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_TOP" file="common/omnibox_ev_bubble_top.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_TOP_LEFT" file="common/omnibox_ev_bubble_top_left.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_TOP_RIGHT" file="common/omnibox_ev_bubble_top_right.png" />
+ <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EXTENSION_APP" file="common/omnibox_extension_app.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_EXTENSION_APP_DARK" file="common/omnibox_extension_app_dark.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_EXTENSION_APP_SELECTED" file="common/omnibox_extension_app_selected.png" />
+ <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP" file="common/omnibox_http.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_INVALID" file="common/omnibox_https_invalid.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_POLICY_WARNING" file="common/controlled_setting_mandatory.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_VALID" file="common/omnibox_https_valid.png" />
@@ -548,6 +550,7 @@
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_TOP" file="common/omnibox_popup_border_and_shadow_top.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_TOP_LEFT" file="common/omnibox_popup_border_and_shadow_top_left.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_TOP_RIGHT" file="common/omnibox_popup_border_and_shadow_top_right.png" />
+ <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH" file="common/omnibox_search.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH_BUTTON_BOTTOM" file="common/omnibox_search_button_bottom_middle.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH_BUTTON_BOTTOM_LEFT" file="common/omnibox_search_button_bottom_left.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH_BUTTON_BOTTOM_RIGHT" file="common/omnibox_search_button_bottom_right.png" />