| 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/common/system/chromeos/ime_menu/ime_menu_tray.h" | 5 #include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h" |
| 6 | 6 |
| 7 #include "ash/common/accessibility_delegate.h" | 7 #include "ash/common/accessibility_delegate.h" |
| 8 #include "ash/common/ash_constants.h" | 8 #include "ash/common/ash_constants.h" |
| 9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
| 10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
| 11 #include "ash/common/shelf/wm_shelf.h" | 11 #include "ash/common/shelf/wm_shelf.h" |
| 12 #include "ash/common/shelf/wm_shelf_util.h" | 12 #include "ash/common/shelf/wm_shelf_util.h" |
| 13 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h" | 13 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h" |
| 14 #include "ash/common/system/tray/hover_highlight_view.h" | 14 #include "ash/common/system/tray/hover_highlight_view.h" |
| 15 #include "ash/common/system/tray/system_menu_button.h" | 15 #include "ash/common/system/tray/system_menu_button.h" |
| 16 #include "ash/common/system/tray/system_tray_controller.h" | 16 #include "ash/common/system/tray/system_tray_controller.h" |
| 17 #include "ash/common/system/tray/system_tray_delegate.h" | 17 #include "ash/common/system/tray/system_tray_delegate.h" |
| 18 #include "ash/common/system/tray/system_tray_notifier.h" | 18 #include "ash/common/system/tray/system_tray_notifier.h" |
| 19 #include "ash/common/system/tray/tray_constants.h" | 19 #include "ash/common/system/tray/tray_constants.h" |
| 20 #include "ash/common/system/tray/tray_popup_item_style.h" | 20 #include "ash/common/system/tray/tray_popup_item_style.h" |
| 21 #include "ash/common/system/tray/tray_popup_utils.h" | 21 #include "ash/common/system/tray/tray_popup_utils.h" |
| 22 #include "ash/common/system/tray/tray_utils.h" | 22 #include "ash/common/system/tray/tray_utils.h" |
| 23 #include "ash/common/wm_lookup.h" | |
| 24 #include "ash/common/wm_shell.h" | 23 #include "ash/common/wm_shell.h" |
| 25 #include "ash/common/wm_window.h" | 24 #include "ash/common/wm_window.h" |
| 26 #include "ash/public/cpp/shell_window_ids.h" | 25 #include "ash/public/cpp/shell_window_ids.h" |
| 27 #include "ash/resources/grit/ash_resources.h" | 26 #include "ash/resources/grit/ash_resources.h" |
| 28 #include "ash/root_window_controller.h" | 27 #include "ash/root_window_controller.h" |
| 29 #include "ash/strings/grit/ash_strings.h" | 28 #include "ash/strings/grit/ash_strings.h" |
| 30 #include "base/metrics/histogram_macros.h" | 29 #include "base/metrics/histogram_macros.h" |
| 31 #include "base/strings/utf_string_conversions.h" | 30 #include "base/strings/utf_string_conversions.h" |
| 32 #include "ui/base/ime/chromeos/input_method_manager.h" | 31 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 33 #include "ui/base/ime/ime_bridge.h" | 32 #include "ui/base/ime/ime_bridge.h" |
| (...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 | 565 |
| 567 base::string16 ImeMenuTray::GetAccessibleNameForBubble() { | 566 base::string16 ImeMenuTray::GetAccessibleNameForBubble() { |
| 568 return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME); | 567 return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME); |
| 569 } | 568 } |
| 570 | 569 |
| 571 void ImeMenuTray::OnBeforeBubbleWidgetInit( | 570 void ImeMenuTray::OnBeforeBubbleWidgetInit( |
| 572 views::Widget* anchor_widget, | 571 views::Widget* anchor_widget, |
| 573 views::Widget* bubble_widget, | 572 views::Widget* bubble_widget, |
| 574 views::Widget::InitParams* params) const { | 573 views::Widget::InitParams* params) const { |
| 575 // Place the bubble in the same root window as |anchor_widget|. | 574 // Place the bubble in the same root window as |anchor_widget|. |
| 576 WmLookup::Get() | 575 WmWindow::Get(anchor_widget->GetNativeWindow()) |
| 577 ->GetWindowForWidget(anchor_widget) | |
| 578 ->GetRootWindowController() | 576 ->GetRootWindowController() |
| 579 ->ConfigureWidgetInitParamsForContainer( | 577 ->ConfigureWidgetInitParamsForContainer( |
| 580 bubble_widget, kShellWindowId_SettingBubbleContainer, params); | 578 bubble_widget, kShellWindowId_SettingBubbleContainer, params); |
| 581 } | 579 } |
| 582 | 580 |
| 583 void ImeMenuTray::HideBubble(const views::TrayBubbleView* bubble_view) { | 581 void ImeMenuTray::HideBubble(const views::TrayBubbleView* bubble_view) { |
| 584 HideBubbleWithView(bubble_view); | 582 HideBubbleWithView(bubble_view); |
| 585 } | 583 } |
| 586 | 584 |
| 587 void ImeMenuTray::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {} | 585 void ImeMenuTray::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {} |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 643 WmShell::Get()->system_tray_delegate()->GetCurrentIME(¤t_ime_); | 641 WmShell::Get()->system_tray_delegate()->GetCurrentIME(¤t_ime_); |
| 644 | 642 |
| 645 // Updates the tray label based on the current input method. | 643 // Updates the tray label based on the current input method. |
| 646 if (current_ime_.third_party) | 644 if (current_ime_.third_party) |
| 647 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); | 645 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); |
| 648 else | 646 else |
| 649 label_->SetText(current_ime_.short_name); | 647 label_->SetText(current_ime_.short_name); |
| 650 } | 648 } |
| 651 | 649 |
| 652 } // namespace ash | 650 } // namespace ash |
| OLD | NEW |