diff options
Diffstat (limited to 'chrome/browser')
12 files changed, 20 insertions, 10 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index bdaba75..a6e614f 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -18,6 +18,8 @@ <if expr="is_win"> <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="chrome_html" /> </if> + <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml="true" type="chrome_html" /> + <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtml="true" type="chrome_html" /> <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions.html" flattenhtml="true" type="chrome_html" /> <structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flattenhtml="true" type="chrome_html" /> <structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme.css" flattenhtml="true" type="chrome_html" /> @@ -73,8 +75,6 @@ <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml="true" type="BINDATA" /> - <include name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list.json" type="BINDATA" /> <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc index 082d7d0..8cfc008 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc @@ -14,6 +14,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #include "grit/ui_resources_standard.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/resources/chromeos/login/oobe.css b/chrome/browser/resources/chromeos/login/oobe.css index ca5bac3..fe535c3 100644 --- a/chrome/browser/resources/chromeos/login/oobe.css +++ b/chrome/browser/resources/chromeos/login/oobe.css @@ -130,9 +130,11 @@ hr.bottom { #header { -webkit-padding-start: 45px; + /* TODO(thakis): Move oobe.html to a structure element, then the + * image set should be inserted automatically. */ background-image: -webkit-image-set( url('chrome://theme/IDR_PRODUCT_LOGO_32') 1x, - url('chrome://theme/IDR_PRODUCT_LOGO_64') 2x); + url('chrome://theme/IDR_PRODUCT_LOGO_32@2x') 2x); background-position: left center; background-repeat: no-repeat; background-size: 32px; diff --git a/chrome/browser/resources/help/help.css b/chrome/browser/resources/help/help.css index ca482da..0e04e24 100644 --- a/chrome/browser/resources/help/help.css +++ b/chrome/browser/resources/help/help.css @@ -13,6 +13,11 @@ body { margin-top: 10px; } +#help-product-logo { + /* TODO: Remove once http://crbug.com/135179 is fixed */ + content: url('chrome://theme/IDR_PRODUCT_LOGO_32'); +} + #product-description { -webkit-margin-start: 10px; } diff --git a/chrome/browser/resources/help/help.html b/chrome/browser/resources/help/help.html index 762f59a..520589c 100644 --- a/chrome/browser/resources/help/help.html +++ b/chrome/browser/resources/help/help.html @@ -18,7 +18,8 @@ <h1 i18n-content="aboutTitle"></h1> </header> <div id="about-container"> - <img src="chrome://theme/IDR_PRODUCT_LOGO_32"> + <!-- TODO: Revert back to src= once http://crbug.com/135179 is fixed --> + <img id="help-product-logo"> <div id="product-description"> <h2 i18n-content="aboutProductTitle"></h2> <span i18n-content="aboutProductDescription"></span> diff --git a/chrome/browser/tab_contents/spelling_bubble_model.cc b/chrome/browser/tab_contents/spelling_bubble_model.cc index 7760d5b..5d96021 100644 --- a/chrome/browser/tab_contents/spelling_bubble_model.cc +++ b/chrome/browser/tab_contents/spelling_bubble_model.cc @@ -11,7 +11,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.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" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm index 5e64744..23202dc 100644 --- a/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm @@ -11,7 +11,7 @@ #import "chrome/browser/ui/cocoa/confirm_bubble_cocoa.h" #import "chrome/browser/ui/cocoa/confirm_bubble_controller.h" #include "chrome/browser/ui/confirm_bubble_model.h" -#include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #import "testing/gtest_mac.h" #include "ui/base/resource/resource_bundle.h" #import "ui/gfx/point.h" diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm index 7e6f1dc..3946685 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm +++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm @@ -27,7 +27,7 @@ #include "content/public/browser/navigation_details.h" #include "grit/chromium_strings.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/ui/gtk/confirm_bubble_gtk_browsertest.cc b/chrome/browser/ui/gtk/confirm_bubble_gtk_browsertest.cc index d225add..68efb3c 100644 --- a/chrome/browser/ui/gtk/confirm_bubble_gtk_browsertest.cc +++ b/chrome/browser/ui/gtk/confirm_bubble_gtk_browsertest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/confirm_bubble_model.h" #include "chrome/test/base/in_process_browser_test.h" -#include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc index 342e828..29e52c92 100644 --- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc @@ -40,7 +40,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" -#include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/window.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc index 7f0e6a1..edc3e55 100644 --- a/chrome/browser/ui/views/tab_icon_view.cc +++ b/chrome/browser/ui/views/tab_icon_view.cc @@ -14,6 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/app/chrome_command_ids.h" #include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #include "grit/ui_resources.h" #include "grit/ui_resources_standard.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/web_applications/web_app_mac_unittest.mm b/chrome/browser/web_applications/web_app_mac_unittest.mm index 73ca8a7..ef73be5 100644 --- a/chrome/browser/web_applications/web_app_mac_unittest.mm +++ b/chrome/browser/web_applications/web_app_mac_unittest.mm @@ -13,7 +13,7 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/common/mac/app_mode_common.h" -#include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #include "third_party/skia/include/core/SKBitmap.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" |