| 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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 ->GetProfileByUser(user) | 418 ->GetProfileByUser(user) |
| 419 ->GetPrefs() | 419 ->GetPrefs() |
| 420 ->GetBoolean(prefs::kForceMaximizeOnFirstRun); | 420 ->GetBoolean(prefs::kForceMaximizeOnFirstRun); |
| 421 } | 421 } |
| 422 return false; | 422 return false; |
| 423 } | 423 } |
| 424 | 424 |
| 425 void ChromeShellDelegate::PreInit() { | 425 void ChromeShellDelegate::PreInit() { |
| 426 bool first_run_after_boot = base::CommandLine::ForCurrentProcess()->HasSwitch( | 426 bool first_run_after_boot = base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 427 chromeos::switches::kFirstExecAfterBoot); | 427 chromeos::switches::kFirstExecAfterBoot); |
| 428 LOG(ERROR) << "------ ChromeShellDelegate::PreInit --- calling " |
| 429 "chromeos::LoadDisplayPreferences first_run_after_boot:" |
| 430 << first_run_after_boot; |
| 428 chromeos::LoadDisplayPreferences(first_run_after_boot); | 431 chromeos::LoadDisplayPreferences(first_run_after_boot); |
| 429 // Object owns itself, and deletes itself when Observer::OnShutdown is called: | 432 // Object owns itself, and deletes itself when Observer::OnShutdown is called: |
| 430 new policy::DisplayRotationDefaultHandler(); | 433 new policy::DisplayRotationDefaultHandler(); |
| 431 // Set the observer now so that we can save the initial state | 434 // Set the observer now so that we can save the initial state |
| 432 // in Shell::Init. | 435 // in Shell::Init. |
| 433 display_configuration_observer_.reset( | 436 display_configuration_observer_.reset( |
| 434 new chromeos::DisplayConfigurationObserver()); | 437 new chromeos::DisplayConfigurationObserver()); |
| 435 } | 438 } |
| 436 | 439 |
| 437 void ChromeShellDelegate::PreShutdown() { | 440 void ChromeShellDelegate::PreShutdown() { |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 NOTREACHED() << "Unexpected notification " << type; | 602 NOTREACHED() << "Unexpected notification " << type; |
| 600 } | 603 } |
| 601 } | 604 } |
| 602 | 605 |
| 603 void ChromeShellDelegate::PlatformInit() { | 606 void ChromeShellDelegate::PlatformInit() { |
| 604 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 607 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
| 605 content::NotificationService::AllSources()); | 608 content::NotificationService::AllSources()); |
| 606 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, | 609 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, |
| 607 content::NotificationService::AllSources()); | 610 content::NotificationService::AllSources()); |
| 608 } | 611 } |
| OLD | NEW |