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

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

Issue 10894045: ChromeOS: Implement MediaTransferProtocolManager observer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nit Created 8 years, 3 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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 18 matching lines...) Expand all
29 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" 29 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
30 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 30 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.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/login_wizard.h" 33 #include "chrome/browser/chromeos/login/login_wizard.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/user_manager.h" 35 #include "chrome/browser/chromeos/login/user_manager.h"
36 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 36 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
37 #include "chrome/browser/chromeos/login/wizard_controller.h" 37 #include "chrome/browser/chromeos/login/wizard_controller.h"
38 #include "chrome/browser/chromeos/low_memory_observer.h" 38 #include "chrome/browser/chromeos/low_memory_observer.h"
39 #include "chrome/browser/chromeos/mtp/media_transfer_protocol_device_observer.h"
39 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 40 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
40 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" 41 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
41 #include "chrome/browser/chromeos/oom_priority_manager.h" 42 #include "chrome/browser/chromeos/oom_priority_manager.h"
42 #include "chrome/browser/chromeos/power/brightness_observer.h" 43 #include "chrome/browser/chromeos/power/brightness_observer.h"
43 #include "chrome/browser/chromeos/power/output_observer.h" 44 #include "chrome/browser/chromeos/power/output_observer.h"
44 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo s.h" 45 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo s.h"
45 #include "chrome/browser/chromeos/power/power_button_observer.h" 46 #include "chrome/browser/chromeos/power/power_button_observer.h"
46 #include "chrome/browser/chromeos/power/power_state_override.h" 47 #include "chrome/browser/chromeos/power/power_state_override.h"
47 #include "chrome/browser/chromeos/power/resume_observer.h" 48 #include "chrome/browser/chromeos/power/resume_observer.h"
48 #include "chrome/browser/chromeos/power/screen_dimming_observer.h" 49 #include "chrome/browser/chromeos/power/screen_dimming_observer.h"
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 // Thus only show login manager in normal (non-testing) mode. 438 // Thus only show login manager in normal (non-testing) mode.
438 if (!parameters().ui_task) 439 if (!parameters().ui_task)
439 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile()); 440 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile());
440 441
441 // These observers must be initialized after the profile because 442 // These observers must be initialized after the profile because
442 // they use the profile to dispatch extension events. 443 // they use the profile to dispatch extension events.
443 // 444 //
444 // Initialize the brightness observer so that we'll display an onscreen 445 // Initialize the brightness observer so that we'll display an onscreen
445 // indication of brightness changes during login. 446 // indication of brightness changes during login.
446 brightness_observer_.reset(new chromeos::BrightnessObserver()); 447 brightness_observer_.reset(new chromeos::BrightnessObserver());
448 media_transfer_protocol_device_observer_.reset(
449 new chromeos::mtp::MediaTransferProtocolDeviceObserver());
447 output_observer_.reset(new chromeos::OutputObserver()); 450 output_observer_.reset(new chromeos::OutputObserver());
448 resume_observer_.reset(new chromeos::ResumeObserver()); 451 resume_observer_.reset(new chromeos::ResumeObserver());
449 screen_lock_observer_.reset(new chromeos::ScreenLockObserver()); 452 screen_lock_observer_.reset(new chromeos::ScreenLockObserver());
450 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) 453 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
451 power_state_override_.reset(new chromeos::PowerStateOverride()); 454 power_state_override_.reset(new chromeos::PowerStateOverride());
452 455
453 media_device_notifications_ = new chromeos::MediaDeviceNotifications(); 456 media_device_notifications_ = new chromeos::MediaDeviceNotifications();
454 457
455 ChromeBrowserMainPartsLinux::PostProfileInit(); 458 ChromeBrowserMainPartsLinux::PostProfileInit();
456 } 459 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 // the network manager. 519 // the network manager.
517 if (chromeos::CrosNetworkChangeNotifierFactory::GetInstance()) 520 if (chromeos::CrosNetworkChangeNotifierFactory::GetInstance())
518 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown(); 521 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown();
519 522
520 // We should remove observers attached to D-Bus clients before 523 // We should remove observers attached to D-Bus clients before
521 // DBusThreadManager is shut down. 524 // DBusThreadManager is shut down.
522 session_manager_observer_.reset(); 525 session_manager_observer_.reset();
523 screen_lock_observer_.reset(); 526 screen_lock_observer_.reset();
524 resume_observer_.reset(); 527 resume_observer_.reset();
525 brightness_observer_.reset(); 528 brightness_observer_.reset();
529 media_transfer_protocol_device_observer_.reset();
526 output_observer_.reset(); 530 output_observer_.reset();
527 531
528 // The XInput2 event listener needs to be shut down earlier than when 532 // The XInput2 event listener needs to be shut down earlier than when
529 // Singletons are finally destroyed in AtExitManager. 533 // Singletons are finally destroyed in AtExitManager.
530 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop(); 534 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();
531 535
532 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, 536 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
533 // even if Initialize() wasn't called. 537 // even if Initialize() wasn't called.
534 chromeos::SystemKeyEventListener::Shutdown(); 538 chromeos::SystemKeyEventListener::Shutdown();
535 chromeos::imageburner::BurnManager::Shutdown(); 539 chromeos::imageburner::BurnManager::Shutdown();
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; 600 LOG(WARNING) << "low_mem: Part of '100MB' experiment";
597 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); 601 chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
598 } else if (trial->group() == margin_200mb) { 602 } else if (trial->group() == margin_200mb) {
599 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 603 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
600 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); 604 chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
601 } else { 605 } else {
602 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 606 LOG(WARNING) << "low_mem: Part of 'default' experiment";
603 } 607 }
604 } 608 }
605 } 609 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698