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

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

Issue 8394030: Chrome OS: Add bluetooth API for device discovery (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename BluetoothDevice accessors Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "chrome/browser/chromeos/bluetooth/bluetooth_manager.h"
12 #include "chrome/browser/chromeos/boot_times_loader.h" 13 #include "chrome/browser/chromeos/boot_times_loader.h"
13 #include "chrome/browser/chromeos/brightness_observer.h" 14 #include "chrome/browser/chromeos/brightness_observer.h"
14 #include "chrome/browser/chromeos/cros/cros_library.h" 15 #include "chrome/browser/chromeos/cros/cros_library.h"
15 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 16 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
16 #include "chrome/browser/chromeos/dbus/session_manager_client.h" 17 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
17 #include "chrome/browser/chromeos/login/session_manager_observer.h" 18 #include "chrome/browser/chromeos/login/session_manager_observer.h"
18 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 19 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
19 #include "chrome/browser/chromeos/system/statistics_provider.h" 20 #include "chrome/browser/chromeos/system/statistics_provider.h"
20 #include "chrome/browser/defaults.h" 21 #include "chrome/browser/defaults.h"
21 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 69
69 static base::LazyInstance<MessageLoopObserver> g_message_loop_observer( 70 static base::LazyInstance<MessageLoopObserver> g_message_loop_observer(
70 base::LINKER_INITIALIZED); 71 base::LINKER_INITIALIZED);
71 72
72 ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos( 73 ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
73 const MainFunctionParams& parameters) 74 const MainFunctionParams& parameters)
74 : ChromeBrowserMainPartsBase(parameters) { 75 : ChromeBrowserMainPartsBase(parameters) {
75 } 76 }
76 77
77 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() { 78 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
79 chromeos::BluetoothManager::Shutdown();
80
78 // We should remove observers attached to D-Bus clients before 81 // We should remove observers attached to D-Bus clients before
79 // DBusThreadManager is shut down. 82 // DBusThreadManager is shut down.
80 if (session_manager_observer_.get()) { 83 if (session_manager_observer_.get()) {
81 chromeos::DBusThreadManager::Get()->session_manager_client()-> 84 chromeos::DBusThreadManager::Get()->session_manager_client()->
82 RemoveObserver(session_manager_observer_.get()); 85 RemoveObserver(session_manager_observer_.get());
83 } 86 }
84 if (brightness_observer_.get()) { 87 if (brightness_observer_.get()) {
85 chromeos::DBusThreadManager::Get()->power_manager_client()->RemoveObserver( 88 chromeos::DBusThreadManager::Get()->power_manager_client()->RemoveObserver(
86 brightness_observer_.get()); 89 brightness_observer_.get());
87 } 90 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // Initialize the brightness observer so that we'll display an onscreen 146 // Initialize the brightness observer so that we'll display an onscreen
144 // indication of brightness changes during login. 147 // indication of brightness changes during login.
145 brightness_observer_.reset(new chromeos::BrightnessObserver()); 148 brightness_observer_.reset(new chromeos::BrightnessObserver());
146 chromeos::DBusThreadManager::Get()->power_manager_client()->AddObserver( 149 chromeos::DBusThreadManager::Get()->power_manager_client()->AddObserver(
147 brightness_observer_.get()); 150 brightness_observer_.get());
148 // Initialize the session manager observer so that we'll take actions 151 // Initialize the session manager observer so that we'll take actions
149 // per signals sent from the session manager. 152 // per signals sent from the session manager.
150 session_manager_observer_.reset(new chromeos::SessionManagerObserver); 153 session_manager_observer_.reset(new chromeos::SessionManagerObserver);
151 chromeos::DBusThreadManager::Get()->session_manager_client()-> 154 chromeos::DBusThreadManager::Get()->session_manager_client()->
152 AddObserver(session_manager_observer_.get()); 155 AddObserver(session_manager_observer_.get());
156
157 // Initialize the Chrome OS bluetooth subsystem
158 if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) {
159 chromeos::BluetoothManager::Initialize();
160 }
153 } 161 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698