| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/ime_menu/ime_menu_tray.h" | 5 #include "ash/system/ime_menu/ime_menu_tray.h" |
| 6 | 6 |
| 7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
| 8 #include "ash/ash_constants.h" | 8 #include "ash/ash_constants.h" |
| 9 #include "ash/public/cpp/shell_window_ids.h" | 9 #include "ash/public/cpp/shell_window_ids.h" |
| 10 #include "ash/resources/grit/ash_resources.h" | 10 #include "ash/resources/grit/ash_resources.h" |
| 11 #include "ash/root_window_controller.h" | 11 #include "ash/root_window_controller.h" |
| 12 #include "ash/session/session_state_delegate.h" | 12 #include "ash/session/session_state_delegate.h" |
| 13 #include "ash/shelf/wm_shelf.h" | 13 #include "ash/shelf/wm_shelf.h" |
| 14 #include "ash/shelf/wm_shelf_util.h" | 14 #include "ash/shelf/wm_shelf_util.h" |
| 15 #include "ash/shell.h" | 15 #include "ash/shell.h" |
| 16 #include "ash/strings/grit/ash_strings.h" | 16 #include "ash/strings/grit/ash_strings.h" |
| 17 #include "ash/system/ime_menu/ime_list_view.h" | 17 #include "ash/system/ime_menu/ime_list_view.h" |
| 18 #include "ash/system/tray/system_menu_button.h" | 18 #include "ash/system/tray/system_menu_button.h" |
| 19 #include "ash/system/tray/system_tray_controller.h" | 19 #include "ash/system/tray/system_tray_controller.h" |
| 20 #include "ash/system/tray/system_tray_delegate.h" | 20 #include "ash/system/tray/system_tray_delegate.h" |
| 21 #include "ash/system/tray/system_tray_notifier.h" | 21 #include "ash/system/tray/system_tray_notifier.h" |
| 22 #include "ash/system/tray/tray_constants.h" | 22 #include "ash/system/tray/tray_constants.h" |
| 23 #include "ash/system/tray/tray_container.h" |
| 23 #include "ash/system/tray/tray_popup_item_style.h" | 24 #include "ash/system/tray/tray_popup_item_style.h" |
| 24 #include "ash/system/tray/tray_popup_utils.h" | 25 #include "ash/system/tray/tray_popup_utils.h" |
| 25 #include "ash/system/tray/tray_utils.h" | 26 #include "ash/system/tray/tray_utils.h" |
| 26 #include "ash/wm_shell.h" | 27 #include "ash/wm_shell.h" |
| 27 #include "ash/wm_window.h" | 28 #include "ash/wm_window.h" |
| 28 #include "base/metrics/histogram_macros.h" | 29 #include "base/metrics/histogram_macros.h" |
| 29 #include "base/strings/utf_string_conversions.h" | 30 #include "base/strings/utf_string_conversions.h" |
| 30 #include "ui/base/ime/chromeos/input_method_manager.h" | 31 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 31 #include "ui/base/ime/ime_bridge.h" | 32 #include "ui/base/ime/ime_bridge.h" |
| 32 #include "ui/base/ime/text_input_client.h" | 33 #include "ui/base/ime/text_input_client.h" |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 scroller()->ClipHeightTo(height_range.start(), height_range.end()); | 266 scroller()->ClipHeightTo(height_range.start(), height_range.end()); |
| 266 ImeListView::Layout(); | 267 ImeListView::Layout(); |
| 267 } | 268 } |
| 268 | 269 |
| 269 DISALLOW_COPY_AND_ASSIGN(ImeMenuListView); | 270 DISALLOW_COPY_AND_ASSIGN(ImeMenuListView); |
| 270 }; | 271 }; |
| 271 | 272 |
| 272 } // namespace | 273 } // namespace |
| 273 | 274 |
| 274 ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf) | 275 ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf) |
| 275 : TrayBackgroundView(wm_shelf, true), | 276 : TrayBackgroundView(wm_shelf), |
| 276 label_(new ImeMenuLabel()), | 277 label_(new ImeMenuLabel()), |
| 277 show_keyboard_(false), | 278 show_keyboard_(false), |
| 278 force_show_keyboard_(false), | 279 force_show_keyboard_(false), |
| 279 should_block_shelf_auto_hide_(false), | 280 should_block_shelf_auto_hide_(false), |
| 280 keyboard_suppressed_(false), | 281 keyboard_suppressed_(false), |
| 281 show_bubble_after_keyboard_hidden_(false) { | 282 show_bubble_after_keyboard_hidden_(false) { |
| 282 SetInkDropMode(InkDropMode::ON); | 283 SetInkDropMode(InkDropMode::ON); |
| 283 SetupLabelForTray(label_); | 284 SetupLabelForTray(label_); |
| 284 tray_container()->AddChildView(label_); | 285 tray_container()->AddChildView(label_); |
| 285 SystemTrayNotifier* tray_notifier = Shell::Get()->system_tray_notifier(); | 286 SystemTrayNotifier* tray_notifier = Shell::Get()->system_tray_notifier(); |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 Shell::Get()->system_tray_delegate()->GetCurrentIME(¤t_ime_); | 542 Shell::Get()->system_tray_delegate()->GetCurrentIME(¤t_ime_); |
| 542 | 543 |
| 543 // Updates the tray label based on the current input method. | 544 // Updates the tray label based on the current input method. |
| 544 if (current_ime_.third_party) | 545 if (current_ime_.third_party) |
| 545 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); | 546 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); |
| 546 else | 547 else |
| 547 label_->SetText(current_ime_.short_name); | 548 label_->SetText(current_ime_.short_name); |
| 548 } | 549 } |
| 549 | 550 |
| 550 } // namespace ash | 551 } // namespace ash |
| OLD | NEW |