diff options
| -rw-r--r-- | chrome/app/theme/chromium/product_logo_64.png | bin | 0 -> 5486 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 4 | ||||
| -rw-r--r-- | chrome/browser/resources/chromeos/login/oobe.css | 10 | ||||
| -rw-r--r-- | chrome/browser/resources/chromeos/login/oobe.html | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome_installer.gypi | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/chrome/app/theme/chromium/product_logo_64.png b/chrome/app/theme/chromium/product_logo_64.png Binary files differnew file mode 100644 index 0000000..87e8cfc --- /dev/null +++ b/chrome/app/theme/chromium/product_logo_64.png diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index b779e91..e037b6f 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -192,7 +192,7 @@ <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_26" file="google_chrome/product_logo_26.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_NAME" file="google_chrome/product_logo_name.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" type="BINDATA" /> </if> <if expr="not pp_ifdef('_google_chrome')"> @@ -201,7 +201,7 @@ <include name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_26" file="chromium/product_logo_26.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_NAME" file="chromium/product_logo_name.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" type="BINDATA" /> </if> <!-- NOTE: product_logo_*.* files beyond what's listed above are referenced by installer code; don't remove them unless you know what diff --git a/chrome/browser/resources/chromeos/login/oobe.css b/chrome/browser/resources/chromeos/login/oobe.css index c73ecd5..b10a059 100644 --- a/chrome/browser/resources/chromeos/login/oobe.css +++ b/chrome/browser/resources/chromeos/login/oobe.css @@ -69,18 +69,14 @@ hr.bottom { } #header { - background: url('chrome://theme/IDR_PRODUCT_LOGO_NAME') left center no-repeat; + background: url('chrome://theme/IDR_PRODUCT_LOGO_64') left center no-repeat; + background-size: 48px; color: #737373; display: -webkit-box; font-size: 20px; height: 48px; line-height: 48px; -<if expr="pp_ifdef('_google_chrome')"> - padding-left: 120px; -</if> -<if expr="not pp_ifdef('_google_chrome')"> - padding-left: 146px; -</if> + padding-left: 54px; } #header span, diff --git a/chrome/browser/resources/chromeos/login/oobe.html b/chrome/browser/resources/chromeos/login/oobe.html index 55d0d20..bf906f4 100644 --- a/chrome/browser/resources/chromeos/login/oobe.html +++ b/chrome/browser/resources/chromeos/login/oobe.html @@ -41,6 +41,9 @@ <div id="oobe" class="faded"> <div id="outer-container"> <div id="header"> + <div> + <span i18n-content="productName"></span> + </div> <div id="header-sections"></div> </div> <hr class="top shadow"> diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc index 51a16eb..e9f705d 100644 --- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc @@ -35,6 +35,8 @@ CoreOobeHandler::~CoreOobeHandler() { void CoreOobeHandler::GetLocalizedStrings( base::DictionaryValue* localized_strings) { + localized_strings->SetString( + "productName", l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)); } void CoreOobeHandler::Initialize() { diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 7d0684a..3cebf2c 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -484,7 +484,7 @@ '<(branding_dir)/product_logo_24.png', '<(branding_dir)/product_logo_32.png', '<(branding_dir)/product_logo_48.png', - '<(branding_dir)/product_logo_name.png', + '<(branding_dir)/product_logo_64.png', '<(branding_dir)/product_logo_128.png', '<(branding_dir)/product_logo_256.png', '<(branding_dir)/product_logo_32.xpm', |
