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

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 "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 60 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
61 #include "chrome/browser/defaults.h" 61 #include "chrome/browser/defaults.h"
62 #include "chrome/browser/metrics/metrics_service.h" 62 #include "chrome/browser/metrics/metrics_service.h"
63 #include "chrome/browser/net/chrome_network_delegate.h" 63 #include "chrome/browser/net/chrome_network_delegate.h"
64 #include "chrome/browser/policy/browser_policy_connector.h" 64 #include "chrome/browser/policy/browser_policy_connector.h"
65 #include "chrome/browser/prefs/pref_service.h" 65 #include "chrome/browser/prefs/pref_service.h"
66 #include "chrome/browser/profiles/profile.h" 66 #include "chrome/browser/profiles/profile.h"
67 #include "chrome/browser/profiles/profile_manager.h" 67 #include "chrome/browser/profiles/profile_manager.h"
68 #include "chrome/browser/signin/token_service_factory.h" 68 #include "chrome/browser/signin/token_service_factory.h"
69 #include "chrome/browser/system_monitor/media_device_notifications_chromeos.h" 69 #include "chrome/browser/system_monitor/media_device_notifications_chromeos.h"
70 #include "chrome/browser/system_monitor/media_transfer_protocol_device_observer_ chromeos.h"
70 #include "chrome/common/chrome_notification_types.h" 71 #include "chrome/common/chrome_notification_types.h"
71 #include "chrome/common/chrome_switches.h" 72 #include "chrome/common/chrome_switches.h"
72 #include "chrome/common/chrome_version_info.h" 73 #include "chrome/common/chrome_version_info.h"
73 #include "chrome/common/logging_chrome.h" 74 #include "chrome/common/logging_chrome.h"
74 #include "chrome/common/pref_names.h" 75 #include "chrome/common/pref_names.h"
75 #include "chromeos/cryptohome/async_method_caller.h" 76 #include "chromeos/cryptohome/async_method_caller.h"
76 #include "chromeos/dbus/dbus_thread_manager.h" 77 #include "chromeos/dbus/dbus_thread_manager.h"
77 #include "chromeos/dbus/power_manager_client.h" 78 #include "chromeos/dbus/power_manager_client.h"
78 #include "chromeos/dbus/session_manager_client.h" 79 #include "chromeos/dbus/session_manager_client.h"
79 #include "chromeos/disks/disk_mount_manager.h" 80 #include "chromeos/disks/disk_mount_manager.h"
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 // Thus only show login manager in normal (non-testing) mode. 452 // Thus only show login manager in normal (non-testing) mode.
452 if (!parameters().ui_task) 453 if (!parameters().ui_task)
453 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile()); 454 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile());
454 455
455 // These observers must be initialized after the profile because 456 // These observers must be initialized after the profile because
456 // they use the profile to dispatch extension events. 457 // they use the profile to dispatch extension events.
457 // 458 //
458 // Initialize the brightness observer so that we'll display an onscreen 459 // Initialize the brightness observer so that we'll display an onscreen
459 // indication of brightness changes during login. 460 // indication of brightness changes during login.
460 brightness_observer_.reset(new chromeos::BrightnessObserver()); 461 brightness_observer_.reset(new chromeos::BrightnessObserver());
462 media_transfer_protocol_device_observer_.reset(
463 new chromeos::mtp::MediaTransferProtocolDeviceObserverCros());
461 output_observer_.reset(new chromeos::OutputObserver()); 464 output_observer_.reset(new chromeos::OutputObserver());
462 resume_observer_.reset(new chromeos::ResumeObserver()); 465 resume_observer_.reset(new chromeos::ResumeObserver());
463 screen_lock_observer_.reset(new chromeos::ScreenLockObserver()); 466 screen_lock_observer_.reset(new chromeos::ScreenLockObserver());
464 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) 467 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
465 power_state_override_.reset(new chromeos::PowerStateOverride()); 468 power_state_override_.reset(new chromeos::PowerStateOverride());
466 469
467 media_device_notifications_ = new chromeos::MediaDeviceNotifications(); 470 media_device_notifications_ = new chromeos::MediaDeviceNotifications();
468 471
469 ChromeBrowserMainPartsLinux::PostProfileInit(); 472 ChromeBrowserMainPartsLinux::PostProfileInit();
470 } 473 }
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown(); 535 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown();
533 536
534 // Tell DeviceSettingsService to stop talking to session_manager. 537 // Tell DeviceSettingsService to stop talking to session_manager.
535 chromeos::DeviceSettingsService::Get()->Shutdown(); 538 chromeos::DeviceSettingsService::Get()->Shutdown();
536 539
537 // We should remove observers attached to D-Bus clients before 540 // We should remove observers attached to D-Bus clients before
538 // DBusThreadManager is shut down. 541 // DBusThreadManager is shut down.
539 screen_lock_observer_.reset(); 542 screen_lock_observer_.reset();
540 resume_observer_.reset(); 543 resume_observer_.reset();
541 brightness_observer_.reset(); 544 brightness_observer_.reset();
545 media_transfer_protocol_device_observer_.reset();
542 output_observer_.reset(); 546 output_observer_.reset();
543 547
544 // The XInput2 event listener needs to be shut down earlier than when 548 // The XInput2 event listener needs to be shut down earlier than when
545 // Singletons are finally destroyed in AtExitManager. 549 // Singletons are finally destroyed in AtExitManager.
546 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop(); 550 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();
547 551
548 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, 552 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
549 // even if Initialize() wasn't called. 553 // even if Initialize() wasn't called.
550 chromeos::SystemKeyEventListener::Shutdown(); 554 chromeos::SystemKeyEventListener::Shutdown();
551 chromeos::imageburner::BurnManager::Shutdown(); 555 chromeos::imageburner::BurnManager::Shutdown();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; 614 LOG(WARNING) << "low_mem: Part of '100MB' experiment";
611 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); 615 chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
612 } else if (trial->group() == margin_200mb) { 616 } else if (trial->group() == margin_200mb) {
613 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 617 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
614 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); 618 chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
615 } else { 619 } else {
616 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 620 LOG(WARNING) << "low_mem: Part of 'default' experiment";
617 } 621 }
618 } 622 }
619 } 623 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698