| OLD | NEW |
| 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/ash/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <limits> | 9 #include <limits> |
| 10 | 10 |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 } | 380 } |
| 381 | 381 |
| 382 void ChromeShellDelegate::PreInit() { | 382 void ChromeShellDelegate::PreInit() { |
| 383 chromeos::LoadDisplayPreferences(IsFirstRunAfterBoot()); | 383 chromeos::LoadDisplayPreferences(IsFirstRunAfterBoot()); |
| 384 // Object owns itself, and deletes itself when Observer::OnShutdown is called: | 384 // Object owns itself, and deletes itself when Observer::OnShutdown is called: |
| 385 new policy::DisplayRotationDefaultHandler(); | 385 new policy::DisplayRotationDefaultHandler(); |
| 386 // Set the observer now so that we can save the initial state | 386 // Set the observer now so that we can save the initial state |
| 387 // in Shell::Init. | 387 // in Shell::Init. |
| 388 display_configuration_observer_.reset( | 388 display_configuration_observer_.reset( |
| 389 new chromeos::DisplayConfigurationObserver()); | 389 new chromeos::DisplayConfigurationObserver()); |
| 390 | |
| 391 chrome_user_metrics_recorder_.reset(new ChromeUserMetricsRecorder); | |
| 392 } | 390 } |
| 393 | 391 |
| 394 void ChromeShellDelegate::PreShutdown() { | 392 void ChromeShellDelegate::PreShutdown() { |
| 395 display_configuration_observer_.reset(); | 393 display_configuration_observer_.reset(); |
| 396 | |
| 397 chrome_user_metrics_recorder_.reset(); | |
| 398 } | 394 } |
| 399 | 395 |
| 400 void ChromeShellDelegate::Exit() { | 396 void ChromeShellDelegate::Exit() { |
| 401 chrome::AttemptUserExit(); | 397 chrome::AttemptUserExit(); |
| 402 } | 398 } |
| 403 | 399 |
| 404 void ChromeShellDelegate::OpenUrlFromArc(const GURL& url) { | 400 void ChromeShellDelegate::OpenUrlFromArc(const GURL& url) { |
| 405 if (!url.is_valid()) | 401 if (!url.is_valid()) |
| 406 return; | 402 return; |
| 407 | 403 |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 NOTREACHED() << "Unexpected notification " << type; | 544 NOTREACHED() << "Unexpected notification " << type; |
| 549 } | 545 } |
| 550 } | 546 } |
| 551 | 547 |
| 552 void ChromeShellDelegate::PlatformInit() { | 548 void ChromeShellDelegate::PlatformInit() { |
| 553 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 549 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
| 554 content::NotificationService::AllSources()); | 550 content::NotificationService::AllSources()); |
| 555 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, | 551 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, |
| 556 content::NotificationService::AllSources()); | 552 content::NotificationService::AllSources()); |
| 557 } | 553 } |
| OLD | NEW |