add welcome page favicon

closes brave/brave-browser#584
brave · Oct 1, 2018 · bc22009 · bc22009
1 parent 6d74d11
commit bc22009
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 2 deletions.
diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -75,6 +75,7 @@ void CustomizeWebUIHTMLSource(const std::string &name, content::WebUIDataSource*
       }
     }, {
       std::string("welcome"), {
+      { "ecaefa14dcf65df518730a336430727e.ico", IDR_BRAVE_WELCOME_FAVICON },
       { "51a13e5e543f312a990d4fd7e741d427.png", IDR_BRAVE_WELCOME_SLIDE_1_IMAGE },
       { "a6abd363c58f91a260f94f5beb32b172.png", IDR_BRAVE_WELCOME_SLIDE_2_IMAGE },
       { "fc31b8d3f7f3d32eec78365212f3002b.png", IDR_BRAVE_WELCOME_SLIDE_3_IMAGE },

diff --git a/components/brave_welcome_ui/brave_welcome.html b/components/brave_welcome_ui/brave_welcome.html
@@ -5,6 +5,7 @@
 <meta name="viewport" content="width=device-width">
 <title>Welcome</title>
 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
+<link rel="shortcut icon" href="chrome://welcome/ecaefa14dcf65df518730a336430727e.ico" type="image/x-icon">
 <link rel="import" href="chrome://resources/html/cr.html">
 <script src="chrome://resources/js/cr.js"></script>
 <script src="chrome://resources/js/load_time_data.js"></script>

diff --git a/components/img/welcome/favicon.ico b/components/img/welcome/favicon.ico
diff --git a/components/resources/brave_components_resources.grd b/components/resources/brave_components_resources.grd
@@ -82,6 +82,7 @@
       <!-- WebUI welcome page resources -->
       <include name="IDR_BRAVE_WELCOME_HTML" file="../brave_welcome_ui/brave_welcome.html" type="BINDATA" />
       <include name="IDR_BRAVE_WELCOME_JS" file="${root_gen_dir}/brave/brave_welcome.bundle.js" type="BINDATA" use_base_dir="false" />
+      <include name="IDR_BRAVE_WELCOME_FAVICON" file="../img/welcome/favicon.ico" type="BINDATA" />
 
       <include name="IDR_BRAVE_WELCOME_SLIDE_1_IMAGE" file="../img/welcome/brave_logo.png" type="BINDATA" />
       <include name="IDR_BRAVE_WELCOME_SLIDE_2_IMAGE" file="../img/welcome/features.png" type="BINDATA" />

diff --git a/components/webpack/dev.config.js b/components/webpack/dev.config.js
@@ -59,7 +59,7 @@ module.exports = {
         loader: 'url-loader?limit=13000&minetype=application/font-woff'
       },
       {
-        test: /\.(ttf|eot|svg|png|jpg|jpeg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        test: /\.(ttf|eot|svg|ico|png|jpg|jpeg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
         loader: 'file-loader'
       }]
   },

diff --git a/components/webpack/prod.config.js b/components/webpack/prod.config.js
@@ -70,7 +70,7 @@ module.exports = {
         loader: 'url-loader?limit=13000&minetype=application/font-woff'
       },
       {
-        test: /\.(ttf|eot|svg|png|jpg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        test: /\.(ttf|eot|ico|svg|png|jpg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
         loader: 'file-loader'
       }]
   },