OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ash/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
6 | 6 |
7 #include "ash/accelerators/magnifier_key_scroller.h" | 7 #include "ash/accelerators/magnifier_key_scroller.h" |
8 #include "ash/accelerators/spoken_feedback_toggler.h" | 8 #include "ash/accelerators/spoken_feedback_toggler.h" |
9 #include "ash/accessibility_delegate.h" | 9 #include "ash/accessibility_delegate.h" |
10 #include "ash/wm/mru_window_tracker.h" | 10 #include "ash/wm/mru_window_tracker.h" |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 } | 216 } |
217 | 217 |
218 private: | 218 private: |
219 DISALLOW_COPY_AND_ASSIGN(AccessibilityDelegateImpl); | 219 DISALLOW_COPY_AND_ASSIGN(AccessibilityDelegateImpl); |
220 }; | 220 }; |
221 #endif | 221 #endif |
222 | 222 |
223 } // anonymous namespace | 223 } // anonymous namespace |
224 | 224 |
225 bool ChromeShellDelegate::IsFirstRunAfterBoot() const { | 225 bool ChromeShellDelegate::IsFirstRunAfterBoot() const { |
226 return CommandLine::ForCurrentProcess()->HasSwitch( | 226 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
227 chromeos::switches::kFirstExecAfterBoot); | 227 chromeos::switches::kFirstExecAfterBoot); |
228 } | 228 } |
229 | 229 |
230 void ChromeShellDelegate::PreInit() { | 230 void ChromeShellDelegate::PreInit() { |
231 chromeos::LoadDisplayPreferences(IsFirstRunAfterBoot()); | 231 chromeos::LoadDisplayPreferences(IsFirstRunAfterBoot()); |
232 // Set the observer now so that we can save the initial state | 232 // Set the observer now so that we can save the initial state |
233 // in Shell::Init. | 233 // in Shell::Init. |
234 display_configuration_observer_.reset( | 234 display_configuration_observer_.reset( |
235 new chromeos::DisplayConfigurationObserver()); | 235 new chromeos::DisplayConfigurationObserver()); |
236 } | 236 } |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
296 } | 296 } |
297 | 297 |
298 void ChromeShellDelegate::PlatformInit() { | 298 void ChromeShellDelegate::PlatformInit() { |
299 registrar_.Add(this, | 299 registrar_.Add(this, |
300 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 300 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
301 content::NotificationService::AllSources()); | 301 content::NotificationService::AllSources()); |
302 registrar_.Add(this, | 302 registrar_.Add(this, |
303 chrome::NOTIFICATION_SESSION_STARTED, | 303 chrome::NOTIFICATION_SESSION_STARTED, |
304 content::NotificationService::AllSources()); | 304 content::NotificationService::AllSources()); |
305 } | 305 } |
OLD | NEW |