Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: chrome/browser/ui/webui/welcome_win10_ui.cc

Issue 2590253002: Implementing Win 10 FRE visual design tweaks requested by first UX pass. (Closed)
Patch Set: Replying to dbeam comments Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/resources/welcome/win10/sectioned.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/welcome_win10_ui.h" 5 #include "chrome/browser/ui/webui/welcome_win10_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/feature_list.h" 9 #include "base/feature_list.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 if (is_inline_style) { 110 if (is_inline_style) {
111 html_source->AddResourcePath(kCssFilePath, IDR_WELCOME_WIN10_INLINE_CSS); 111 html_source->AddResourcePath(kCssFilePath, IDR_WELCOME_WIN10_INLINE_CSS);
112 html_source->AddResourcePath(kJsFilePath, IDR_WELCOME_WIN10_INLINE_JS); 112 html_source->AddResourcePath(kJsFilePath, IDR_WELCOME_WIN10_INLINE_JS);
113 html_source->SetDefaultResource(IDR_WELCOME_WIN10_INLINE_HTML); 113 html_source->SetDefaultResource(IDR_WELCOME_WIN10_INLINE_HTML);
114 } else { 114 } else {
115 html_source->AddResourcePath(kCssFilePath, IDR_WELCOME_WIN10_SECTIONED_CSS); 115 html_source->AddResourcePath(kCssFilePath, IDR_WELCOME_WIN10_SECTIONED_CSS);
116 html_source->AddResourcePath(kJsFilePath, IDR_WELCOME_WIN10_SECTIONED_JS); 116 html_source->AddResourcePath(kJsFilePath, IDR_WELCOME_WIN10_SECTIONED_JS);
117 html_source->SetDefaultResource(IDR_WELCOME_WIN10_SECTIONED_HTML); 117 html_source->SetDefaultResource(IDR_WELCOME_WIN10_SECTIONED_HTML);
118 } 118 }
119 119
120 // Logo images of all scales. 120 html_source->AddResourcePath("logo-small.png", IDR_PRODUCT_LOGO_64);
121 html_source->AddResourcePath("logo-small.png", IDR_PRODUCT_LOGO_32); 121 html_source->AddResourcePath("logo-large.png", IDR_PRODUCT_LOGO_128);
122 html_source->AddResourcePath("logo-small2x.png", IDR_PRODUCT_LOGO_64);
123 html_source->AddResourcePath("logo-large.png", IDR_PRODUCT_LOGO_64);
124 html_source->AddResourcePath("logo-large2x.png", IDR_PRODUCT_LOGO_128);
125 122
126 content::WebUIDataSource::Add(profile, html_source); 123 content::WebUIDataSource::Add(profile, html_source);
127 } 124 }
128 125
129 WelcomeWin10UI::~WelcomeWin10UI() = default; 126 WelcomeWin10UI::~WelcomeWin10UI() = default;
OLDNEW
« no previous file with comments | « chrome/browser/resources/welcome/win10/sectioned.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698