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

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

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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
OLDNEW
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/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 <sys/types.h> 8 #include <sys/types.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 24 matching lines...) Expand all
35 #include "chrome/browser/chromeos/login/update_screen.h" 35 #include "chrome/browser/chromeos/login/update_screen.h"
36 #include "chrome/browser/chromeos/login/user_image_screen.h" 36 #include "chrome/browser/chromeos/login/user_image_screen.h"
37 #include "chrome/browser/chromeos/login/user_manager.h" 37 #include "chrome/browser/chromeos/login/user_manager.h"
38 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" 38 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
39 #include "chrome/browser/prefs/pref_service.h" 39 #include "chrome/browser/prefs/pref_service.h"
40 #include "chrome/browser/profiles/profile_manager.h" 40 #include "chrome/browser/profiles/profile_manager.h"
41 #include "chrome/browser/ui/options/options_util.h" 41 #include "chrome/browser/ui/options/options_util.h"
42 #include "chrome/common/pref_names.h" 42 #include "chrome/common/pref_names.h"
43 #include "content/public/browser/notification_types.h" 43 #include "content/public/browser/notification_types.h"
44 #include "ui/base/l10n/l10n_util.h" 44 #include "ui/base/l10n/l10n_util.h"
45 #include "views/accelerator.h" 45 #include "ui/base/models/accelerator.h"
46 46
47 #if defined(USE_LINUX_BREAKPAD) 47 #if defined(USE_LINUX_BREAKPAD)
48 #include "chrome/app/breakpad_linux.h" 48 #include "chrome/app/breakpad_linux.h"
49 #endif 49 #endif
50 50
51 using content::BrowserThread; 51 using content::BrowserThread;
52 52
53 namespace { 53 namespace {
54 54
55 // A boolean pref of the EULA accepted flag. 55 // A boolean pref of the EULA accepted flag.
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 693
694 bool WizardController::usage_statistics_reporting() const { 694 bool WizardController::usage_statistics_reporting() const {
695 return usage_statistics_reporting_; 695 return usage_statistics_reporting_;
696 } 696 }
697 697
698 void WizardController::SetZeroDelays() { 698 void WizardController::SetZeroDelays() {
699 kShowDelayMs = 0; 699 kShowDelayMs = 0;
700 } 700 }
701 701
702 } // namespace chromeos 702 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698