| 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/chromeos/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/chromeos/chromeos_version.h" | 9 #include "base/chromeos/chromeos_version.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
| 12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
| 13 #include "base/string_number_conversions.h" | 13 #include "base/string_number_conversions.h" |
| 14 #include "base/string_split.h" | 14 #include "base/string_split.h" |
| 15 #include "chrome/browser/browser_process_impl.h" | 15 #include "chrome/browser/browser_process_impl.h" |
| 16 #include "chrome/browser/chromeos/audio/audio_handler.h" | 16 #include "chrome/browser/chromeos/audio/audio_handler.h" |
| 17 #include "chrome/browser/chromeos/background/desktop_background_observer.h" | |
| 18 #include "chrome/browser/chromeos/boot_times_loader.h" | 17 #include "chrome/browser/chromeos/boot_times_loader.h" |
| 19 #include "chrome/browser/chromeos/cros/cros_library.h" | 18 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 20 #include "chrome/browser/chromeos/cryptohome/async_method_caller.h" | 19 #include "chrome/browser/chromeos/cryptohome/async_method_caller.h" |
| 21 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" | 20 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" |
| 22 #include "chrome/browser/chromeos/disks/disk_mount_manager.h" | 21 #include "chrome/browser/chromeos/disks/disk_mount_manager.h" |
| 23 #include "chrome/browser/chromeos/external_metrics.h" | 22 #include "chrome/browser/chromeos/external_metrics.h" |
| 24 #include "chrome/browser/chromeos/imageburner/burn_manager.h" | 23 #include "chrome/browser/chromeos/imageburner/burn_manager.h" |
| 25 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 24 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
| 26 #include "chrome/browser/chromeos/input_method/xkeyboard.h" | 25 #include "chrome/browser/chromeos/input_method/xkeyboard.h" |
| 27 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" | 26 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 g_browser_process->browser_policy_connector()->InitializeUserPolicy( | 353 g_browser_process->browser_policy_connector()->InitializeUserPolicy( |
| 355 username, false /* wait_for_policy_fetch */); | 354 username, false /* wait_for_policy_fetch */); |
| 356 content::NotificationService::current()->Notify( | 355 content::NotificationService::current()->Notify( |
| 357 chrome::NOTIFICATION_SESSION_STARTED, | 356 chrome::NOTIFICATION_SESSION_STARTED, |
| 358 content::NotificationService::AllSources(), | 357 content::NotificationService::AllSources(), |
| 359 content::NotificationService::NoDetails()); | 358 content::NotificationService::NoDetails()); |
| 360 } | 359 } |
| 361 | 360 |
| 362 // In Aura builds this will initialize ash::Shell. | 361 // In Aura builds this will initialize ash::Shell. |
| 363 ChromeBrowserMainPartsLinux::PreProfileInit(); | 362 ChromeBrowserMainPartsLinux::PreProfileInit(); |
| 364 | |
| 365 // Initialize desktop background observer so that it can receive | |
| 366 // LOGIN_USER_CHANGED notification from UserManager. | |
| 367 desktop_background_observer_.reset(new chromeos::DesktopBackgroundObserver); | |
| 368 } | 363 } |
| 369 | 364 |
| 370 void ChromeBrowserMainPartsChromeos::PostProfileInit() { | 365 void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
| 371 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 366 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 372 // -- just after CreateProfile(). | 367 // -- just after CreateProfile(). |
| 373 | 368 |
| 374 if (parsed_command_line().HasSwitch(switches::kLoginUser) && | 369 if (parsed_command_line().HasSwitch(switches::kLoginUser) && |
| 375 !parsed_command_line().HasSwitch(switches::kLoginPassword)) { | 370 !parsed_command_line().HasSwitch(switches::kLoginPassword)) { |
| 376 // Pass the TokenService pointer to the policy connector so user policy can | 371 // Pass the TokenService pointer to the policy connector so user policy can |
| 377 // grab a token and register with the policy server. | 372 // grab a token and register with the policy server. |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 | 482 |
| 488 // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell | 483 // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell |
| 489 // singleton before the shell is destroyed. | 484 // singleton before the shell is destroyed. |
| 490 video_property_writer_.reset(); | 485 video_property_writer_.reset(); |
| 491 // Remove PowerButtonObserver attached to a D-Bus client before | 486 // Remove PowerButtonObserver attached to a D-Bus client before |
| 492 // DBusThreadManager is shut down. | 487 // DBusThreadManager is shut down. |
| 493 power_button_observer_.reset(); | 488 power_button_observer_.reset(); |
| 494 | 489 |
| 495 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun(); | 490 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun(); |
| 496 } | 491 } |
| OLD | NEW |