diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/resources/default_200_percent/default_favicon.png | bin | 0 -> 2836 bytes | |||
| -rw-r--r-- | ui/resources/ui_resources.grd | 1 | ||||
| -rw-r--r-- | ui/resources/ui_resources_standard.grd | 1 | ||||
| -rw-r--r-- | ui/views/button_drag_utils.cc | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/ui/resources/default_200_percent/default_favicon.png b/ui/resources/default_200_percent/default_favicon.png Binary files differnew file mode 100644 index 0000000..da4ee65 --- /dev/null +++ b/ui/resources/default_200_percent/default_favicon.png diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 6d3ccce..e9a2586 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -29,7 +29,6 @@ <include name="IDR_CONTENT_BOTTOM_RIGHT_CORNER" file="default_100_percent/content_bottom_right_corner.png" type="BINDATA" /> <include name="IDR_CONTENT_LEFT_SIDE" file="default_100_percent/content_left_side.png" type="BINDATA" /> <include name="IDR_CONTENT_RIGHT_SIDE" file="default_100_percent/content_right_side.png" type="BINDATA" /> - <include name="IDR_DEFAULT_FAVICON" file="default_100_percent/default_favicon.png" type="BINDATA" /> <include name="IDR_DEFAULT_LARGE_FAVICON" file="default_100_percent/default_large_favicon.png" type="BINDATA" /> <include name="IDR_FOLDER_CLOSED" file="default_100_percent/folder_closed.png" type="BINDATA" /> <include name="IDR_FOLDER_CLOSED_RTL" file="default_100_percent/folder_closed_rtl.png" type="BINDATA" /> diff --git a/ui/resources/ui_resources_standard.grd b/ui/resources/ui_resources_standard.grd index 633f98d..f643f4a 100644 --- a/ui/resources/ui_resources_standard.grd +++ b/ui/resources/ui_resources_standard.grd @@ -44,6 +44,7 @@ <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_H" file="close_bar_hover.png" /> <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" /> <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_P" file="close_bar_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_DEFAULT_FAVICON" file="default_favicon.png" /> <structure type="chrome_scaled_image" name="IDR_THROBBER" file="throbber.png" /> <!-- Remaining images only used by Aura. --> diff --git a/ui/views/button_drag_utils.cc b/ui/views/button_drag_utils.cc index 8bdfe94..bfc1d531 100644 --- a/ui/views/button_drag_utils.cc +++ b/ui/views/button_drag_utils.cc @@ -6,7 +6,7 @@ #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" -#include "grit/ui_resources.h" +#include "grit/ui_resources_standard.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/resource/resource_bundle.h" |
