OLD | NEW |
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/system_tray_delegate.h" | 10 #include "ash/system/tray/system_tray_delegate.h" |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 bool can_activate_; | 273 bool can_activate_; |
274 | 274 |
275 int autoclose_delay_; | 275 int autoclose_delay_; |
276 base::OneShotTimer<SystemTrayBubble> autoclose_; | 276 base::OneShotTimer<SystemTrayBubble> autoclose_; |
277 | 277 |
278 DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble); | 278 DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble); |
279 }; | 279 }; |
280 | 280 |
281 } // namespace internal | 281 } // namespace internal |
282 | 282 |
| 283 NetworkIconInfo::NetworkIconInfo() { |
| 284 } |
| 285 |
283 SystemTray::SystemTray() | 286 SystemTray::SystemTray() |
284 : items_(), | 287 : items_(), |
285 bubble_(NULL), | 288 bubble_(NULL), |
286 popup_(NULL) { | 289 popup_(NULL) { |
287 container_ = new views::View; | 290 container_ = new views::View; |
288 container_->SetLayoutManager(new views::BoxLayout( | 291 container_->SetLayoutManager(new views::BoxLayout( |
289 views::BoxLayout::kHorizontal, 5, 0, 3)); | 292 views::BoxLayout::kHorizontal, 5, 0, 3)); |
290 container_->set_background(new SystemTrayBackground); | 293 container_->set_background(new SystemTrayBackground); |
291 set_border(views::Border::CreateEmptyBorder(0, 0, | 294 set_border(views::Border::CreateEmptyBorder(0, 0, |
292 kPaddingFromBottomOfScreen, kPaddingFromRightEdgeOfScreen)); | 295 kPaddingFromBottomOfScreen, kPaddingFromRightEdgeOfScreen)); |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 SchedulePaint(); | 429 SchedulePaint(); |
427 } | 430 } |
428 | 431 |
429 void SystemTray::OnWidgetClosing(views::Widget* widget) { | 432 void SystemTray::OnWidgetClosing(views::Widget* widget) { |
430 CHECK_EQ(popup_, widget); | 433 CHECK_EQ(popup_, widget); |
431 popup_ = NULL; | 434 popup_ = NULL; |
432 bubble_ = NULL; | 435 bubble_ = NULL; |
433 } | 436 } |
434 | 437 |
435 } // namespace ash | 438 } // namespace ash |
OLD | NEW |