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

Side by Side Diff: ash/system/tray/system_tray.cc

Issue 9753019: ash: Add a bluetooth entry in the uber tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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 "ash/system/tray/system_tray.h" 5 #include "ash/system/tray/system_tray.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell/panel_window.h" 8 #include "ash/shell/panel_window.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/system/tray/tray_constants.h" 10 #include "ash/system/tray/tray_constants.h"
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 369
370 } // namespace internal 370 } // namespace internal
371 371
372 NetworkIconInfo::NetworkIconInfo() 372 NetworkIconInfo::NetworkIconInfo()
373 : highlight(false) { 373 : highlight(false) {
374 } 374 }
375 375
376 NetworkIconInfo::~NetworkIconInfo() { 376 NetworkIconInfo::~NetworkIconInfo() {
377 } 377 }
378 378
379 BluetoothDeviceInfo::BluetoothDeviceInfo()
380 : connected(false) {
381 }
382
383 BluetoothDeviceInfo::~BluetoothDeviceInfo() {
384 }
385
379 SystemTray::SystemTray() 386 SystemTray::SystemTray()
380 : items_(), 387 : items_(),
381 accessibility_observer_(NULL), 388 accessibility_observer_(NULL),
382 audio_observer_(NULL), 389 audio_observer_(NULL),
390 bluetooth_observer_(NULL),
383 brightness_observer_(NULL), 391 brightness_observer_(NULL),
384 caps_lock_observer_(NULL), 392 caps_lock_observer_(NULL),
385 clock_observer_(NULL), 393 clock_observer_(NULL),
386 network_observer_(NULL), 394 network_observer_(NULL),
387 power_status_observer_(NULL), 395 power_status_observer_(NULL),
388 update_observer_(NULL), 396 update_observer_(NULL),
389 user_observer_(NULL), 397 user_observer_(NULL),
390 bubble_(NULL), 398 bubble_(NULL),
391 popup_(NULL) { 399 popup_(NULL) {
392 container_ = new views::View; 400 container_ = new views::View;
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 SchedulePaint(); 539 SchedulePaint();
532 } 540 }
533 541
534 void SystemTray::OnWidgetClosing(views::Widget* widget) { 542 void SystemTray::OnWidgetClosing(views::Widget* widget) {
535 CHECK_EQ(popup_, widget); 543 CHECK_EQ(popup_, widget);
536 popup_ = NULL; 544 popup_ = NULL;
537 bubble_ = NULL; 545 bubble_ = NULL;
538 } 546 }
539 547
540 } // namespace ash 548 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698