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

Side by Side Diff: chrome/browser/ui/webui/crashes_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: Convert ptr to bool for win compile. 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/crashes_ui.h" 5 #include "chrome/browser/ui/webui/crashes_ui.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 13 matching lines...) Expand all
24 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "content/public/browser/web_ui.h" 25 #include "content/public/browser/web_ui.h"
26 #include "content/public/browser/web_ui_message_handler.h" 26 #include "content/public/browser/web_ui_message_handler.h"
27 #include "grit/browser_resources.h" 27 #include "grit/browser_resources.h"
28 #include "grit/chromium_strings.h" 28 #include "grit/chromium_strings.h"
29 #include "grit/generated_resources.h" 29 #include "grit/generated_resources.h"
30 #include "grit/theme_resources.h" 30 #include "grit/theme_resources.h"
31 #include "grit/theme_resources_standard.h" 31 #include "grit/theme_resources_standard.h"
32 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
34 #include "ui/base/resource/resource_handle.h"
34 35
35 #if defined(OS_CHROMEOS) 36 #if defined(OS_CHROMEOS)
36 #include "chrome/browser/chromeos/cros_settings.h" 37 #include "chrome/browser/chromeos/cros_settings.h"
37 #endif 38 #endif
38 39
39 using content::WebContents; 40 using content::WebContents;
40 using content::WebUIMessageHandler; 41 using content::WebUIMessageHandler;
41 42
42 namespace { 43 namespace {
43 44
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 web_ui->AddMessageHandler(new CrashesDOMHandler()); 165 web_ui->AddMessageHandler(new CrashesDOMHandler());
165 166
166 // Set up the chrome://crashes/ source. 167 // Set up the chrome://crashes/ source.
167 Profile* profile = Profile::FromWebUI(web_ui); 168 Profile* profile = Profile::FromWebUI(web_ui);
168 ChromeURLDataManager::AddDataSource(profile, CreateCrashesUIHTMLSource()); 169 ChromeURLDataManager::AddDataSource(profile, CreateCrashesUIHTMLSource());
169 } 170 }
170 171
171 // static 172 // static
172 base::RefCountedMemory* CrashesUI::GetFaviconResourceBytes() { 173 base::RefCountedMemory* CrashesUI::GetFaviconResourceBytes() {
173 return ResourceBundle::GetSharedInstance(). 174 return ResourceBundle::GetSharedInstance().
174 LoadDataResourceBytes(IDR_SAD_FAVICON); 175 LoadDataResourceBytes(IDR_SAD_FAVICON,
176 ui::ResourceHandle::kScaleFactorNone);
175 } 177 }
176 178
177 // static 179 // static
178 bool CrashesUI::CrashReportingEnabled() { 180 bool CrashesUI::CrashReportingEnabled() {
179 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) 181 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
180 PrefService* prefs = g_browser_process->local_state(); 182 PrefService* prefs = g_browser_process->local_state();
181 return prefs->GetBoolean(prefs::kMetricsReportingEnabled); 183 return prefs->GetBoolean(prefs::kMetricsReportingEnabled);
182 #elif defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS) 184 #elif defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS)
183 bool reporting_enabled = false; 185 bool reporting_enabled = false;
184 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, 186 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
185 &reporting_enabled); 187 &reporting_enabled);
186 return reporting_enabled; 188 return reporting_enabled;
187 #else 189 #else
188 return false; 190 return false;
189 #endif 191 #endif
190 } 192 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698