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

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

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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) 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 <vector> 5 #include <vector>
6 6
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/chromeos/login/views_eula_screen_actor.h" 8 #include "chrome/browser/chromeos/login/views_eula_screen_actor.h"
9 #include "chrome/browser/chromeos/login/views_oobe_display.h" 9 #include "chrome/browser/chromeos/login/views_oobe_display.h"
10 #include "chrome/browser/chromeos/login/views_network_screen_actor.h" 10 #include "chrome/browser/chromeos/login/views_network_screen_actor.h"
11 #include "chrome/browser/chromeos/login/views_update_screen_actor.h" 11 #include "chrome/browser/chromeos/login/views_update_screen_actor.h"
12 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" 12 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
13 #include "chrome/browser/chromeos/login/wizard_controller.h" 13 #include "chrome/browser/chromeos/login/wizard_controller.h"
14 #include "chrome/browser/chromeos/wm_ipc.h" 14 #include "chrome/browser/chromeos/wm_ipc.h"
15 #include "chrome/common/chrome_notification_types.h"
15 #include "content/common/notification_service.h" 16 #include "content/common/notification_service.h"
16 #include "content/common/notification_type.h"
17 #include "views/view.h" 17 #include "views/view.h"
18 #include "views/widget/widget.h" 18 #include "views/widget/widget.h"
19 19
20 namespace chromeos { 20 namespace chromeos {
21 21
22 namespace { 22 namespace {
23 23
24 // RootView of the Widget WizardController creates. Contains the contents of the 24 // RootView of the Widget WizardController creates. Contains the contents of the
25 // WizardController. 25 // WizardController.
26 class ContentView : public views::View { 26 class ContentView : public views::View {
(...skipping 28 matching lines...) Expand all
55 AddAccelerator(accel_eula_screen_); 55 AddAccelerator(accel_eula_screen_);
56 AddAccelerator(accel_register_screen_); 56 AddAccelerator(accel_register_screen_);
57 AddAccelerator(accel_enterprise_enrollment_screen_); 57 AddAccelerator(accel_enterprise_enrollment_screen_);
58 #endif 58 #endif
59 AddAccelerator(accel_toggle_accessibility_); 59 AddAccelerator(accel_toggle_accessibility_);
60 AddAccelerator(accel_cancel_update_); 60 AddAccelerator(accel_cancel_update_);
61 } 61 }
62 62
63 ~ContentView() { 63 ~ContentView() {
64 NotificationService::current()->Notify( 64 NotificationService::current()->Notify(
65 NotificationType::WIZARD_CONTENT_VIEW_DESTROYED, 65 chrome::NOTIFICATION_WIZARD_CONTENT_VIEW_DESTROYED,
66 NotificationService::AllSources(), 66 NotificationService::AllSources(),
67 NotificationService::NoDetails()); 67 NotificationService::NoDetails());
68 } 68 }
69 69
70 bool AcceleratorPressed(const views::Accelerator& accel) { 70 bool AcceleratorPressed(const views::Accelerator& accel) {
71 WizardController* controller = WizardController::default_controller(); 71 WizardController* controller = WizardController::default_controller();
72 if (!controller) 72 if (!controller)
73 return false; 73 return false;
74 74
75 if (accel == accel_toggle_accessibility_) { 75 if (accel == accel_toggle_accessibility_) {
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 255
256 void ViewsOobeDisplay::SetScreenSize(const gfx::Size &screen_size) { 256 void ViewsOobeDisplay::SetScreenSize(const gfx::Size &screen_size) {
257 screen_size_ = screen_size; 257 screen_size_ = screen_size;
258 } 258 }
259 259
260 void ViewsOobeDisplay::SetScreenObserver(ScreenObserver* screen_observer) { 260 void ViewsOobeDisplay::SetScreenObserver(ScreenObserver* screen_observer) {
261 screen_observer_ = screen_observer; 261 screen_observer_ = screen_observer;
262 } 262 }
263 263
264 } // namespace chromeos 264 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/user_manager.cc ('k') | chrome/browser/chromeos/login/wizard_accessibility_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698