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

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

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/flags_ui.h" 5 #include "chrome/browser/ui/webui/flags_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/memory/ref_counted_memory.h" 11 #include "base/memory/ref_counted_memory.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/about_flags.h" 14 #include "chrome/browser/about_flags.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/browser_list.h" 18 #include "chrome/browser/ui/browser_list.h"
19 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 19 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
20 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 20 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
21 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
24 #include "content/public/browser/web_ui.h" 24 #include "content/public/browser/web_ui.h"
25 #include "content/public/browser/web_ui_message_handler.h" 25 #include "content/public/browser/web_ui_message_handler.h"
26 #include "grit/browser_resources.h" 26 #include "grit/browser_resources.h"
27 #include "grit/chromium_strings.h" 27 #include "grit/chromium_strings.h"
28 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
29 #include "grit/theme_resources.h"
29 #include "grit/theme_resources_standard.h" 30 #include "grit/theme_resources_standard.h"
30 #include "grit/theme_resources.h"
31 #include "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
32 #include "ui/base/layout.h"
32 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
33 34
34 #if defined(OS_CHROMEOS) 35 #if defined(OS_CHROMEOS)
35 #include "base/chromeos/chromeos_version.h" 36 #include "base/chromeos/chromeos_version.h"
36 #include "chrome/browser/chromeos/cros_settings.h" 37 #include "chrome/browser/chromeos/cros_settings.h"
37 #include "chrome/browser/chromeos/login/user_manager.h" 38 #include "chrome/browser/chromeos/login/user_manager.h"
38 #endif 39 #endif
39 40
40 using content::WebContents; 41 using content::WebContents;
41 using content::WebUIMessageHandler; 42 using content::WebUIMessageHandler;
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 web_ui->AddMessageHandler(new FlagsDOMHandler()); 163 web_ui->AddMessageHandler(new FlagsDOMHandler());
163 164
164 // Set up the about:flags source. 165 // Set up the about:flags source.
165 Profile* profile = Profile::FromWebUI(web_ui); 166 Profile* profile = Profile::FromWebUI(web_ui);
166 ChromeURLDataManager::AddDataSource(profile, CreateFlagsUIHTMLSource()); 167 ChromeURLDataManager::AddDataSource(profile, CreateFlagsUIHTMLSource());
167 } 168 }
168 169
169 // static 170 // static
170 base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes() { 171 base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes() {
171 return ResourceBundle::GetSharedInstance(). 172 return ResourceBundle::GetSharedInstance().
172 LoadDataResourceBytes(IDR_FLAGS); 173 LoadDataResourceBytes(IDR_FLAGS, ui::SCALE_FACTOR_100P);
173 } 174 }
174 175
175 // static 176 // static
176 void FlagsUI::RegisterPrefs(PrefService* prefs) { 177 void FlagsUI::RegisterPrefs(PrefService* prefs) {
177 prefs->RegisterListPref(prefs::kEnabledLabsExperiments); 178 prefs->RegisterListPref(prefs::kEnabledLabsExperiments);
178 } 179 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698