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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 9960072: Upstream crash changes for android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixes to gyp and a typo in breakpad_linuxish.cc Created 8 years, 8 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/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/browser/profiles/profile_manager.h" 43 #include "chrome/browser/profiles/profile_manager.h"
44 #include "chrome/browser/ui/options/options_util.h" 44 #include "chrome/browser/ui/options/options_util.h"
45 #include "chrome/common/chrome_notification_types.h" 45 #include "chrome/common/chrome_notification_types.h"
46 #include "chrome/common/pref_names.h" 46 #include "chrome/common/pref_names.h"
47 #include "content/public/browser/notification_service.h" 47 #include "content/public/browser/notification_service.h"
48 #include "content/public/browser/notification_types.h" 48 #include "content/public/browser/notification_types.h"
49 #include "ui/base/accelerators/accelerator.h" 49 #include "ui/base/accelerators/accelerator.h"
50 #include "ui/base/l10n/l10n_util.h" 50 #include "ui/base/l10n/l10n_util.h"
51 51
52 #if defined(USE_LINUX_BREAKPAD) 52 #if defined(USE_LINUX_BREAKPAD)
53 #include "chrome/app/breakpad_linux.h" 53 #include "chrome/app/breakpad_linuxish.h"
54 #endif 54 #endif
55 55
56 using content::BrowserThread; 56 using content::BrowserThread;
57 57
58 namespace { 58 namespace {
59 59
60 // A boolean pref of the EULA accepted flag. 60 // A boolean pref of the EULA accepted flag.
61 const char kEulaAccepted[] = "EulaAccepted"; 61 const char kEulaAccepted[] = "EulaAccepted";
62 62
63 // A string pref with initial locale set in VPD or manifest. 63 // A string pref with initial locale set in VPD or manifest.
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 744
745 bool WizardController::usage_statistics_reporting() const { 745 bool WizardController::usage_statistics_reporting() const {
746 return usage_statistics_reporting_; 746 return usage_statistics_reporting_;
747 } 747 }
748 748
749 void WizardController::SetZeroDelays() { 749 void WizardController::SetZeroDelays() {
750 kShowDelayMs = 0; 750 kShowDelayMs = 0;
751 } 751 }
752 752
753 } // namespace chromeos 753 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/crash_handler_host_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698