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/tray_constants.h" | 10 #include "ash/system/tray/tray_constants.h" |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 } | 409 } |
410 | 410 |
411 IMEInfo::IMEInfo() | 411 IMEInfo::IMEInfo() |
412 : selected(false) { | 412 : selected(false) { |
413 } | 413 } |
414 | 414 |
415 IMEInfo::~IMEInfo() { | 415 IMEInfo::~IMEInfo() { |
416 } | 416 } |
417 | 417 |
418 IMEPropertyInfo::IMEPropertyInfo() | 418 IMEPropertyInfo::IMEPropertyInfo() |
419 : selected(false) { | 419 : selected(false), |
| 420 is_selection(false) { |
420 } | 421 } |
421 | 422 |
422 IMEPropertyInfo::~IMEPropertyInfo() { | 423 IMEPropertyInfo::~IMEPropertyInfo() { |
423 } | 424 } |
424 | 425 |
425 SystemTray::SystemTray() | 426 SystemTray::SystemTray() |
426 : items_(), | 427 : items_(), |
427 accessibility_observer_(NULL), | 428 accessibility_observer_(NULL), |
428 audio_observer_(NULL), | 429 audio_observer_(NULL), |
429 bluetooth_observer_(NULL), | 430 bluetooth_observer_(NULL), |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
660 popup_->Hide(); | 661 popup_->Hide(); |
661 } | 662 } |
662 } | 663 } |
663 return base::EVENT_CONTINUE; | 664 return base::EVENT_CONTINUE; |
664 } | 665 } |
665 | 666 |
666 void SystemTray::DidProcessEvent(const base::NativeEvent& event) { | 667 void SystemTray::DidProcessEvent(const base::NativeEvent& event) { |
667 } | 668 } |
668 | 669 |
669 } // namespace ash | 670 } // namespace ash |
OLD | NEW |