| 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_controller.h" | 12 #include "ash/session/session_controller.h" |
| 13 #include "ash/shelf/wm_shelf.h" | 13 #include "ash/shelf/wm_shelf.h" |
| 14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
| 15 #include "ash/shell_port.h" | 15 #include "ash/shell_port.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_container.h" |
| 24 #include "ash/system/tray/tray_popup_item_style.h" | 24 #include "ash/system/tray/tray_popup_item_style.h" |
| 25 #include "ash/system/tray/tray_popup_utils.h" | 25 #include "ash/system/tray/tray_popup_utils.h" |
| 26 #include "ash/system/tray/tray_utils.h" | 26 #include "ash/system/tray/tray_utils.h" |
| 27 #include "ash/wm_window.h" | |
| 28 #include "base/metrics/histogram_macros.h" | 27 #include "base/metrics/histogram_macros.h" |
| 29 #include "base/strings/utf_string_conversions.h" | 28 #include "base/strings/utf_string_conversions.h" |
| 30 #include "components/session_manager/session_manager_types.h" | 29 #include "components/session_manager/session_manager_types.h" |
| 31 #include "ui/base/ime/chromeos/input_method_manager.h" | 30 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 32 #include "ui/base/ime/ime_bridge.h" | 31 #include "ui/base/ime/ime_bridge.h" |
| 33 #include "ui/base/ime/text_input_client.h" | 32 #include "ui/base/ime/text_input_client.h" |
| 34 #include "ui/base/l10n/l10n_util.h" | 33 #include "ui/base/l10n/l10n_util.h" |
| 35 #include "ui/base/resource/resource_bundle.h" | 34 #include "ui/base/resource/resource_bundle.h" |
| 36 #include "ui/gfx/paint_vector_icon.h" | 35 #include "ui/gfx/paint_vector_icon.h" |
| 37 #include "ui/gfx/range/range.h" | 36 #include "ui/gfx/range/range.h" |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 | 468 |
| 470 base::string16 ImeMenuTray::GetAccessibleNameForBubble() { | 469 base::string16 ImeMenuTray::GetAccessibleNameForBubble() { |
| 471 return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME); | 470 return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME); |
| 472 } | 471 } |
| 473 | 472 |
| 474 void ImeMenuTray::OnBeforeBubbleWidgetInit( | 473 void ImeMenuTray::OnBeforeBubbleWidgetInit( |
| 475 views::Widget* anchor_widget, | 474 views::Widget* anchor_widget, |
| 476 views::Widget* bubble_widget, | 475 views::Widget* bubble_widget, |
| 477 views::Widget::InitParams* params) const { | 476 views::Widget::InitParams* params) const { |
| 478 // Place the bubble in the same root window as |anchor_widget|. | 477 // Place the bubble in the same root window as |anchor_widget|. |
| 479 WmWindow::Get(anchor_widget->GetNativeWindow()) | 478 RootWindowController::ForWindow(anchor_widget->GetNativeWindow()) |
| 480 ->GetRootWindowController() | |
| 481 ->ConfigureWidgetInitParamsForContainer( | 479 ->ConfigureWidgetInitParamsForContainer( |
| 482 bubble_widget, kShellWindowId_SettingBubbleContainer, params); | 480 bubble_widget, kShellWindowId_SettingBubbleContainer, params); |
| 483 } | 481 } |
| 484 | 482 |
| 485 void ImeMenuTray::HideBubble(const views::TrayBubbleView* bubble_view) { | 483 void ImeMenuTray::HideBubble(const views::TrayBubbleView* bubble_view) { |
| 486 HideBubbleWithView(bubble_view); | 484 HideBubbleWithView(bubble_view); |
| 487 } | 485 } |
| 488 | 486 |
| 489 void ImeMenuTray::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {} | 487 void ImeMenuTray::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {} |
| 490 | 488 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 Shell::Get()->system_tray_delegate()->GetCurrentIME(¤t_ime_); | 543 Shell::Get()->system_tray_delegate()->GetCurrentIME(¤t_ime_); |
| 546 | 544 |
| 547 // Updates the tray label based on the current input method. | 545 // Updates the tray label based on the current input method. |
| 548 if (current_ime_.third_party) | 546 if (current_ime_.third_party) |
| 549 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); | 547 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); |
| 550 else | 548 else |
| 551 label_->SetText(current_ime_.short_name); | 549 label_->SetText(current_ime_.short_name); |
| 552 } | 550 } |
| 553 | 551 |
| 554 } // namespace ash | 552 } // namespace ash |
| OLD | NEW |