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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: More refactor Created 8 years, 9 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) 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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 18 matching lines...) Expand all
29 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" 29 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
30 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" 30 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
31 #include "chrome/browser/chromeos/login/authenticator.h" 31 #include "chrome/browser/chromeos/login/authenticator.h"
32 #include "chrome/browser/chromeos/login/login_utils.h" 32 #include "chrome/browser/chromeos/login/login_utils.h"
33 #include "chrome/browser/chromeos/login/ownership_service.h" 33 #include "chrome/browser/chromeos/login/ownership_service.h"
34 #include "chrome/browser/chromeos/login/screen_locker.h" 34 #include "chrome/browser/chromeos/login/screen_locker.h"
35 #include "chrome/browser/chromeos/login/session_manager_observer.h" 35 #include "chrome/browser/chromeos/login/session_manager_observer.h"
36 #include "chrome/browser/chromeos/login/user_manager.h" 36 #include "chrome/browser/chromeos/login/user_manager.h"
37 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 37 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
38 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" 38 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
39 #include "chrome/browser/chromeos/options2/desktop_background_observer.h"
39 #include "chrome/browser/chromeos/power/brightness_observer.h" 40 #include "chrome/browser/chromeos/power/brightness_observer.h"
40 #include "chrome/browser/chromeos/power/resume_observer.h" 41 #include "chrome/browser/chromeos/power/resume_observer.h"
41 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 42 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
42 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h" 43 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
43 #include "chrome/browser/chromeos/system/runtime_environment.h" 44 #include "chrome/browser/chromeos/system/runtime_environment.h"
44 #include "chrome/browser/chromeos/system/statistics_provider.h" 45 #include "chrome/browser/chromeos/system/statistics_provider.h"
45 #include "chrome/browser/chromeos/system_key_event_listener.h" 46 #include "chrome/browser/chromeos/system_key_event_listener.h"
46 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 47 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
47 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" 48 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
48 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 49 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 // been called. 484 // been called.
484 // TODO(vlaviano): Move this back to PostMainMessageLoopStart when we remove 485 // TODO(vlaviano): Move this back to PostMainMessageLoopStart when we remove
485 // the --enable-bluetooth flag. 486 // the --enable-bluetooth flag.
486 if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) { 487 if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) {
487 chromeos::BluetoothManager::Initialize(); 488 chromeos::BluetoothManager::Initialize();
488 } 489 }
489 490
490 #if defined(USE_AURA) 491 #if defined(USE_AURA)
491 // These are dependent on the ash::Shell singleton already having been 492 // These are dependent on the ash::Shell singleton already having been
492 // initialized. 493 // initialized.
494 desktop_background_observer_.reset(new chromeos::DesktopBackgroundObserver);
493 power_button_observer_.reset(new chromeos::PowerButtonObserver); 495 power_button_observer_.reset(new chromeos::PowerButtonObserver);
494 video_property_writer_.reset(new chromeos::VideoPropertyWriter); 496 video_property_writer_.reset(new chromeos::VideoPropertyWriter);
495 #endif 497 #endif
496 498
497 ChromeBrowserMainPartsLinux::PostBrowserStart(); 499 ChromeBrowserMainPartsLinux::PostBrowserStart();
498 } 500 }
499 501
500 // Shut down services before the browser process, etc are destroyed. 502 // Shut down services before the browser process, etc are destroyed.
501 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { 503 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
502 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", 504 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded",
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell 550 // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell
549 // singleton before the shell is destroyed. 551 // singleton before the shell is destroyed.
550 video_property_writer_.reset(); 552 video_property_writer_.reset();
551 // Remove PowerButtonObserver attached to a D-Bus client before 553 // Remove PowerButtonObserver attached to a D-Bus client before
552 // DBusThreadManager is shut down. 554 // DBusThreadManager is shut down.
553 power_button_observer_.reset(); 555 power_button_observer_.reset();
554 #endif 556 #endif
555 557
556 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun(); 558 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
557 } 559 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698