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

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

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 4 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 15 matching lines...) Expand all
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 "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
32 #include "ui/base/layout.h" 32 #include "ui/base/layout.h"
33 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
34 34
35 #if defined(OS_CHROMEOS) 35 #if defined(OS_CHROMEOS)
36 #include "chrome/browser/chromeos/cros_settings.h" 36 #include "chrome/browser/chromeos/settings/cros_settings.h"
37 #endif 37 #endif
38 38
39 using content::WebContents; 39 using content::WebContents;
40 using content::WebUIMessageHandler; 40 using content::WebUIMessageHandler;
41 41
42 namespace { 42 namespace {
43 43
44 ChromeWebUIDataSource* CreateCrashesUIHTMLSource() { 44 ChromeWebUIDataSource* CreateCrashesUIHTMLSource() {
45 ChromeWebUIDataSource* source = 45 ChromeWebUIDataSource* source =
46 new ChromeWebUIDataSource(chrome::kChromeUICrashesHost); 46 new ChromeWebUIDataSource(chrome::kChromeUICrashesHost);
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 return prefs->GetBoolean(prefs::kMetricsReportingEnabled); 183 return prefs->GetBoolean(prefs::kMetricsReportingEnabled);
184 #elif defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS) 184 #elif defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS)
185 bool reporting_enabled = false; 185 bool reporting_enabled = false;
186 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, 186 chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
187 &reporting_enabled); 187 &reporting_enabled);
188 return reporting_enabled; 188 return reporting_enabled;
189 #else 189 #else
190 return false; 190 return false;
191 #endif 191 #endif
192 } 192 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc ('k') | chrome/browser/ui/webui/flags_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698