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

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: Rebase 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" 59 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
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_transfer_protocol_device_observer_ chromeos.h"
69 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos. h" 70 #include "chrome/browser/system_monitor/removable_device_notifications_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"
(...skipping 372 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 removable_device_notifications_ = 470 removable_device_notifications_ =
468 new chromeos::RemovableDeviceNotificationsCros(); 471 new chromeos::RemovableDeviceNotificationsCros();
469 472
470 ChromeBrowserMainPartsLinux::PostProfileInit(); 473 ChromeBrowserMainPartsLinux::PostProfileInit();
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown(); 536 chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown();
534 537
535 // Tell DeviceSettingsService to stop talking to session_manager. 538 // Tell DeviceSettingsService to stop talking to session_manager.
536 chromeos::DeviceSettingsService::Get()->Shutdown(); 539 chromeos::DeviceSettingsService::Get()->Shutdown();
537 540
538 // We should remove observers attached to D-Bus clients before 541 // We should remove observers attached to D-Bus clients before
539 // DBusThreadManager is shut down. 542 // DBusThreadManager is shut down.
540 screen_lock_observer_.reset(); 543 screen_lock_observer_.reset();
541 resume_observer_.reset(); 544 resume_observer_.reset();
542 brightness_observer_.reset(); 545 brightness_observer_.reset();
546 media_transfer_protocol_device_observer_.reset();
543 output_observer_.reset(); 547 output_observer_.reset();
544 548
545 // The XInput2 event listener needs to be shut down earlier than when 549 // The XInput2 event listener needs to be shut down earlier than when
546 // Singletons are finally destroyed in AtExitManager. 550 // Singletons are finally destroyed in AtExitManager.
547 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop(); 551 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();
548 552
549 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, 553 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
550 // even if Initialize() wasn't called. 554 // even if Initialize() wasn't called.
551 chromeos::SystemKeyEventListener::Shutdown(); 555 chromeos::SystemKeyEventListener::Shutdown();
552 chromeos::imageburner::BurnManager::Shutdown(); 556 chromeos::imageburner::BurnManager::Shutdown();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; 615 LOG(WARNING) << "low_mem: Part of '100MB' experiment";
612 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); 616 chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
613 } else if (trial->group() == margin_200mb) { 617 } else if (trial->group() == margin_200mb) {
614 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 618 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
615 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); 619 chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
616 } else { 620 } else {
617 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 621 LOG(WARNING) << "low_mem: Part of 'default' experiment";
618 } 622 }
619 } 623 }
620 } 624 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698