OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 Loading... |
24 #include "content/browser/tab_contents/tab_contents.h" | 24 #include "content/browser/tab_contents/tab_contents.h" |
25 #include "grit/browser_resources.h" | 25 #include "grit/browser_resources.h" |
26 #include "grit/chromium_strings.h" | 26 #include "grit/chromium_strings.h" |
27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
28 #include "grit/theme_resources.h" | 28 #include "grit/theme_resources.h" |
29 #include "grit/theme_resources_standard.h" | 29 #include "grit/theme_resources_standard.h" |
30 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
31 #include "ui/base/resource/resource_bundle.h" | 31 #include "ui/base/resource/resource_bundle.h" |
32 | 32 |
33 #if defined(OS_CHROMEOS) | 33 #if defined(OS_CHROMEOS) |
34 #include "chrome/browser/chromeos/user_cros_settings_provider.h" | 34 #include "chrome/browser/chromeos/cros_settings.h" |
35 #endif | 35 #endif |
36 | 36 |
37 namespace { | 37 namespace { |
38 | 38 |
39 ChromeWebUIDataSource* CreateCrashesUIHTMLSource() { | 39 ChromeWebUIDataSource* CreateCrashesUIHTMLSource() { |
40 ChromeWebUIDataSource* source = | 40 ChromeWebUIDataSource* source = |
41 new ChromeWebUIDataSource(chrome::kChromeUICrashesHost); | 41 new ChromeWebUIDataSource(chrome::kChromeUICrashesHost); |
42 | 42 |
43 source->AddLocalizedString("crashesTitle", IDS_CRASHES_TITLE); | 43 source->AddLocalizedString("crashesTitle", IDS_CRASHES_TITLE); |
44 source->AddLocalizedString("crashCountFormat", | 44 source->AddLocalizedString("crashCountFormat", |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 return ResourceBundle::GetSharedInstance(). | 173 return ResourceBundle::GetSharedInstance(). |
174 LoadDataResourceBytes(IDR_SAD_FAVICON); | 174 LoadDataResourceBytes(IDR_SAD_FAVICON); |
175 } | 175 } |
176 | 176 |
177 // static | 177 // static |
178 bool CrashesUI::CrashReportingEnabled() { | 178 bool CrashesUI::CrashReportingEnabled() { |
179 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) | 179 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) |
180 PrefService* prefs = g_browser_process->local_state(); | 180 PrefService* prefs = g_browser_process->local_state(); |
181 return prefs->GetBoolean(prefs::kMetricsReportingEnabled); | 181 return prefs->GetBoolean(prefs::kMetricsReportingEnabled); |
182 #elif defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS) | 182 #elif defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS) |
183 return chromeos::UserCrosSettingsProvider::cached_reporting_enabled(); | 183 bool reporting_enabled = false; |
| 184 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, |
| 185 &reporting_enabled); |
| 186 return reporting_enabled; |
184 #else | 187 #else |
185 return false; | 188 return false; |
186 #endif | 189 #endif |
187 } | 190 } |
OLD | NEW |