Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

Issue 2726823003: Remove WmLookup. (Closed)
Patch Set: Remove wm_lookup. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/strings/grit/ash_strings.h" 13 #include "ash/common/strings/grit/ash_strings.h"
14 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h" 14 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
15 #include "ash/common/system/tray/hover_highlight_view.h" 15 #include "ash/common/system/tray/hover_highlight_view.h"
16 #include "ash/common/system/tray/system_menu_button.h" 16 #include "ash/common/system/tray/system_menu_button.h"
17 #include "ash/common/system/tray/system_tray_controller.h" 17 #include "ash/common/system/tray/system_tray_controller.h"
18 #include "ash/common/system/tray/system_tray_delegate.h" 18 #include "ash/common/system/tray/system_tray_delegate.h"
19 #include "ash/common/system/tray/system_tray_notifier.h" 19 #include "ash/common/system/tray/system_tray_notifier.h"
20 #include "ash/common/system/tray/tray_constants.h" 20 #include "ash/common/system/tray/tray_constants.h"
21 #include "ash/common/system/tray/tray_popup_item_style.h" 21 #include "ash/common/system/tray/tray_popup_item_style.h"
22 #include "ash/common/system/tray/tray_popup_utils.h" 22 #include "ash/common/system/tray/tray_popup_utils.h"
23 #include "ash/common/system/tray/tray_utils.h" 23 #include "ash/common/system/tray/tray_utils.h"
24 #include "ash/common/wm_lookup.h"
25 #include "ash/common/wm_shell.h" 24 #include "ash/common/wm_shell.h"
26 #include "ash/common/wm_window.h" 25 #include "ash/common/wm_window.h"
27 #include "ash/public/cpp/shell_window_ids.h" 26 #include "ash/public/cpp/shell_window_ids.h"
28 #include "ash/resources/grit/ash_resources.h" 27 #include "ash/resources/grit/ash_resources.h"
29 #include "ash/root_window_controller.h" 28 #include "ash/root_window_controller.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"
34 #include "ui/base/ime/text_input_client.h" 33 #include "ui/base/ime/text_input_client.h"
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 570
572 base::string16 ImeMenuTray::GetAccessibleNameForBubble() { 571 base::string16 ImeMenuTray::GetAccessibleNameForBubble() {
573 return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME); 572 return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME);
574 } 573 }
575 574
576 void ImeMenuTray::OnBeforeBubbleWidgetInit( 575 void ImeMenuTray::OnBeforeBubbleWidgetInit(
577 views::Widget* anchor_widget, 576 views::Widget* anchor_widget,
578 views::Widget* bubble_widget, 577 views::Widget* bubble_widget,
579 views::Widget::InitParams* params) const { 578 views::Widget::InitParams* params) const {
580 // Place the bubble in the same root window as |anchor_widget|. 579 // Place the bubble in the same root window as |anchor_widget|.
581 WmLookup::Get() 580 WmWindow::Get(anchor_widget->GetNativeWindow())
582 ->GetWindowForWidget(anchor_widget)
583 ->GetRootWindowController() 581 ->GetRootWindowController()
584 ->ConfigureWidgetInitParamsForContainer( 582 ->ConfigureWidgetInitParamsForContainer(
585 bubble_widget, kShellWindowId_SettingBubbleContainer, params); 583 bubble_widget, kShellWindowId_SettingBubbleContainer, params);
586 } 584 }
587 585
588 void ImeMenuTray::HideBubble(const views::TrayBubbleView* bubble_view) { 586 void ImeMenuTray::HideBubble(const views::TrayBubbleView* bubble_view) {
589 HideBubbleWithView(bubble_view); 587 HideBubbleWithView(bubble_view);
590 } 588 }
591 589
592 void ImeMenuTray::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {} 590 void ImeMenuTray::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {}
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_); 646 WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
649 647
650 // Updates the tray label based on the current input method. 648 // Updates the tray label based on the current input method.
651 if (current_ime_.third_party) 649 if (current_ime_.third_party)
652 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); 650 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
653 else 651 else
654 label_->SetText(current_ime_.short_name); 652 label_->SetText(current_ime_.short_name);
655 } 653 }
656 654
657 } // namespace ash 655 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698