[Local NTP] Change the Google logo to SVG

Remove previous png logos.

BUG=None
TEST=manual

Review URL: https://codereview.chromium.org/1325853004

Cr-Commit-Position: refs/heads/master@{#365686}

8 files changed, 10 insertions, 15 deletions

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 9d10fcb..af4faff 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -226,7 +226,7 @@
 
       <include name="IDR_INSTANT_IFRAME_VALIDATION_JS" file="resources\local_ntp\instant_iframe_validation.js" type="BINDATA" />
       <include name="IDR_LOCAL_NTP_HTML" file="resources\local_ntp\local_ntp.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-      <include name="IDR_LOCAL_NTP_CSS" file="resources\local_ntp\local_ntp.css" type="BINDATA" />
+      <include name="IDR_LOCAL_NTP_CSS" file="resources\local_ntp\local_ntp.css" flattenhtml="true" type="BINDATA" />
       <include name="IDR_LOCAL_NTP_JS" file="resources\local_ntp\local_ntp.js" flattenhtml="true" type="BINDATA" />
       <include name="IDR_LOCAL_NTP_UTIL_JS" file="resources\local_ntp\local_ntp_util.js" flattenhtml="true" type="BINDATA" />
       <include name="IDR_LOCAL_STATE_HTML" file="resources\local_state\local_state.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
diff --git a/chrome/browser/resources/app_list/start_page.css b/chrome/browser/resources/app_list/start_page.css
index 268feeb..8f6edd0 100644
--- a/chrome/browser/resources/app_list/start_page.css
+++ b/chrome/browser/resources/app_list/start_page.css
@@ -18,13 +18,11 @@ body {
 }
 
 #default_logo {
-  background-image: -webkit-image-set(
-    url(chrome://theme/IDR_LOCAL_NTP_IMAGES_LOGO_PNG) 1x,
-    url(chrome://theme/IDR_LOCAL_NTP_IMAGES_LOGO_PNG@2x) 2x);
+  background-image: url(../../../../ui/webui/resources/images/google_logo.svg);
   background-repeat: no-repeat;
-  height: 95px;
+  height: 92px;
   margin: auto;
-  width: 269px;
+  width: 272px;
 }
 
 #logo_container {
diff --git a/chrome/browser/resources/local_ntp/local_ntp.css b/chrome/browser/resources/local_ntp/local_ntp.css
index 9daeb98..184560e 100644
--- a/chrome/browser/resources/local_ntp/local_ntp.css
+++ b/chrome/browser/resources/local_ntp/local_ntp.css
@@ -38,17 +38,17 @@ body.fakebox-disable #fakebox > input {
 }
 
 #logo {
-  background-image: url(images/google_logo.png@2x);
+  background-image: url(../../../../ui/webui/resources/images/google_logo.svg);
   background-repeat: no-repeat;
-  background-size: 269px 95px;
-  height: 95px;
+  height: 92px;
   margin-bottom: 24px;
   margin-top: 157px;
-  width: 269px;
+  width: 272px;
 }
 
 body.alternate-logo #logo {
-  -webkit-mask-image: url(images/google_logo.png@2x);
+  -webkit-mask-image:
+      url(../../../../ui/webui/resources/images/google_logo.svg);
   -webkit-mask-repeat: no-repeat;
   -webkit-mask-size: 100%;
   background: #eee;
diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc
index ce4f189..aa104f7 100644
--- a/chrome/browser/search/local_ntp_source.cc
+++ b/chrome/browser/search/local_ntp_source.cc
@@ -63,7 +63,6 @@ const struct Resource{
     {"images/close_2_white.png", IDR_CLOSE_2_MASK, "image/png"},
     {"images/close_3_mask.png", IDR_CLOSE_3_MASK, "image/png"},
     {"images/close_4_button.png", IDR_CLOSE_4_BUTTON, "image/png"},
-    {"images/google_logo.png", IDR_LOCAL_NTP_IMAGES_LOGO_PNG, "image/png"},
     {"images/ntp_default_favicon.png", IDR_NTP_DEFAULT_FAVICON, "image/png"},
 };
 
diff --git a/ui/resources/default_100_percent/common/ntp_google_logo.png b/ui/resources/default_100_percent/common/ntp_google_logo.png
deleted file mode 100644
index fee9f76..0000000
--- a/ui/resources/default_100_percent/common/ntp_google_logo.png
+++ /dev/null
diff --git a/ui/resources/default_200_percent/common/ntp_google_logo.png b/ui/resources/default_200_percent/common/ntp_google_logo.png
deleted file mode 100644
index 0b55f7b..0000000
--- a/ui/resources/default_200_percent/common/ntp_google_logo.png
+++ /dev/null
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 6e5f1e7..dbd4b82 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -166,9 +166,6 @@
         <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS_HOVER" file="common/notification_settings_hover.png"/>
         <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS_PRESSED" file="common/notification_settings_pressed.png"/>
       </if>
-      <!-- TODO(calamity): The 1x local ntp resources require a proper version.
-           See crbug.com/363519. -->
-      <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_LOGO_PNG" file="common/ntp_google_logo.png" />
       <if expr="not is_android and not is_ios">
         <structure type="chrome_scaled_image" name="IDR_NTP_DEFAULT_FAVICON" file="common/ntp_default_favicon.png" />
       </if>
diff --git a/ui/webui/resources/images/google_logo.svg b/ui/webui/resources/images/google_logo.svg
new file mode 100644
index 0000000..75c9b58
--- /dev/null
+++ b/ui/webui/resources/images/google_logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 272 92" width="272" height="92"><path fill="#EA4335" d="M115.75 47.18c0 12.77-9.99 22.18-22.25 22.18s-22.25-9.41-22.25-22.18C71.25 34.32 81.24 25 93.5 25s22.25 9.32 22.25 22.18zm-9.74 0c0-7.98-5.79-13.44-12.51-13.44S80.99 39.2 80.99 47.18c0 7.9 5.79 13.44 12.51 13.44s12.51-5.55 12.51-13.44z"/><path fill="#FBBC05" d="M163.75 47.18c0 12.77-9.99 22.18-22.25 22.18s-22.25-9.41-22.25-22.18c0-12.85 9.99-22.18 22.25-22.18s22.25 9.32 22.25 22.18zm-9.74 0c0-7.98-5.79-13.44-12.51-13.44s-12.51 5.46-12.51 13.44c0 7.9 5.79 13.44 12.51 13.44s12.51-5.55 12.51-13.44z"/><path fill="#4285F4" d="M209.75 26.34v39.82c0 16.38-9.66 23.07-21.08 23.07-10.75 0-17.22-7.19-19.66-13.07l8.48-3.53c1.51 3.61 5.21 7.87 11.17 7.87 7.31 0 11.84-4.51 11.84-13v-3.19h-.34c-2.18 2.69-6.38 5.04-11.68 5.04-11.09 0-21.25-9.66-21.25-22.09 0-12.52 10.16-22.26 21.25-22.26 5.29 0 9.49 2.35 11.68 4.96h.34v-3.61h9.25zm-8.56 20.92c0-7.81-5.21-13.52-11.84-13.52-6.72 0-12.35 5.71-12.35 13.52 0 7.73 5.63 13.36 12.35 13.36 6.63 0 11.84-5.63 11.84-13.36z"/><path fill="#34A853" d="M225 3v65h-9.5V3h9.5z"/><path fill="#EA4335" d="M262.02 54.48l7.56 5.04c-2.44 3.61-8.32 9.83-18.48 9.83-12.6 0-22.01-9.74-22.01-22.18 0-13.19 9.49-22.18 20.92-22.18 11.51 0 17.14 9.16 18.98 14.11l1.01 2.52-29.65 12.28c2.27 4.45 5.8 6.72 10.75 6.72 4.96 0 8.4-2.44 10.92-6.14zm-23.27-7.98l19.82-8.23c-1.09-2.77-4.37-4.7-8.23-4.7-4.95 0-11.84 4.37-11.59 12.93z"/><path fill="#4285F4" d="M35.29 41.41V32H67c.31 1.64.47 3.58.47 5.68 0 7.06-1.93 15.79-8.15 22.01-6.05 6.3-13.78 9.66-24.02 9.66C16.32 69.35.36 53.89.36 34.91.36 15.93 16.32.47 35.3.47c10.5 0 17.98 4.12 23.6 9.49l-6.64 6.64c-4.03-3.78-9.49-6.72-16.97-6.72-13.86 0-24.7 11.17-24.7 25.03 0 13.86 10.84 25.03 24.7 25.03 8.99 0 14.11-3.61 17.39-6.89 2.66-2.66 4.41-6.46 5.1-11.65l-22.49.01z"/></svg>
\ No newline at end of file