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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 10911261: chromeos: Stop calling ProfileManager::GetDefaultProfile() from extension event dispatch functions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added function comments 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/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/system/audio/audio_observer.h" 9 #include "ash/system/audio/audio_observer.h"
10 #include "ash/system/bluetooth/bluetooth_observer.h" 10 #include "ash/system/bluetooth/bluetooth_observer.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 network_icon_(ALLOW_THIS_IN_INITIALIZER_LIST( 167 network_icon_(ALLOW_THIS_IN_INITIALIZER_LIST(
168 new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))), 168 new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))),
169 network_icon_dark_(ALLOW_THIS_IN_INITIALIZER_LIST( 169 network_icon_dark_(ALLOW_THIS_IN_INITIALIZER_LIST(
170 new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))), 170 new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))),
171 network_menu_(ALLOW_THIS_IN_INITIALIZER_LIST(new NetworkMenu(this))), 171 network_menu_(ALLOW_THIS_IN_INITIALIZER_LIST(new NetworkMenu(this))),
172 clock_type_(base::k24HourClock), 172 clock_type_(base::k24HourClock),
173 search_key_mapped_to_(input_method::kSearchKey), 173 search_key_mapped_to_(input_method::kSearchKey),
174 screen_locked_(false), 174 screen_locked_(false),
175 connected_network_state_(STATE_UNKNOWN), 175 connected_network_state_(STATE_UNKNOWN),
176 data_promo_notification_(new DataPromoNotification()), 176 data_promo_notification_(new DataPromoNotification()),
177 volume_control_delegate_(ALLOW_THIS_IN_INITIALIZER_LIST( 177 volume_control_delegate_(new VolumeController()) {
178 new VolumeController)) {
179 AudioHandler::GetInstance()->AddVolumeObserver(this); 178 AudioHandler::GetInstance()->AddVolumeObserver(this);
180 DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this); 179 DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
181 DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate( 180 DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate(
182 PowerManagerClient::UPDATE_INITIAL); 181 PowerManagerClient::UPDATE_INITIAL);
183 DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this); 182 DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
184 183
185 NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary(); 184 NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
186 crosnet->AddNetworkManagerObserver(this); 185 crosnet->AddNetworkManagerObserver(this);
187 OnNetworkManagerChanged(crosnet); 186 OnNetworkManagerChanged(crosnet);
188 crosnet->AddCellularDataPlanObserver(this); 187 crosnet->AddCellularDataPlanObserver(this);
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
1269 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1268 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1270 }; 1269 };
1271 1270
1272 } // namespace 1271 } // namespace
1273 1272
1274 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 1273 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
1275 return new chromeos::SystemTrayDelegate(tray); 1274 return new chromeos::SystemTrayDelegate(tray);
1276 } 1275 }
1277 1276
1278 } // namespace chromeos 1277 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698