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

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

Issue 2395523002: chromeos: Refactor system tray "show settings" commands to use mojo (Closed)
Patch Set: Created 4 years, 2 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_util.h" 11 #include "ash/common/shelf/wm_shelf_util.h"
12 #include "ash/common/shell_window_ids.h" 12 #include "ash/common/shell_window_ids.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/fixed_sized_scroll_view.h" 14 #include "ash/common/system/tray/fixed_sized_scroll_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_tray_controller.h"
16 #include "ash/common/system/tray/system_tray_delegate.h" 17 #include "ash/common/system/tray/system_tray_delegate.h"
17 #include "ash/common/system/tray/system_tray_notifier.h" 18 #include "ash/common/system/tray/system_tray_notifier.h"
18 #include "ash/common/system/tray/tray_constants.h" 19 #include "ash/common/system/tray/tray_constants.h"
19 #include "ash/common/system/tray/tray_popup_header_button.h" 20 #include "ash/common/system/tray/tray_popup_header_button.h"
20 #include "ash/common/system/tray/tray_popup_item_style.h" 21 #include "ash/common/system/tray/tray_popup_item_style.h"
21 #include "ash/common/system/tray/tray_utils.h" 22 #include "ash/common/system/tray/tray_utils.h"
22 #include "ash/common/wm_lookup.h" 23 #include "ash/common/wm_lookup.h"
23 #include "ash/common/wm_root_window_controller.h" 24 #include "ash/common/wm_root_window_controller.h"
24 #include "ash/common/wm_shell.h" 25 #include "ash/common/wm_shell.h"
25 #include "ash/common/wm_window.h" 26 #include "ash/common/wm_window.h"
(...skipping 26 matching lines...) Expand all
52 // Returns the height range of ImeListView. 53 // Returns the height range of ImeListView.
53 gfx::Range GetImeListViewRange() { 54 gfx::Range GetImeListViewRange() {
54 const int max_items = 5; 55 const int max_items = 5;
55 const int min_items = 2; 56 const int min_items = 2;
56 const int tray_item_height = GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT); 57 const int tray_item_height = GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT);
57 return gfx::Range(tray_item_height * min_items, tray_item_height * max_items); 58 return gfx::Range(tray_item_height * min_items, tray_item_height * max_items);
58 } 59 }
59 60
60 // Shows language and input settings page. 61 // Shows language and input settings page.
61 void ShowIMESettings() { 62 void ShowIMESettings() {
62 SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
63 WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SHOW_DETAILED); 63 WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SHOW_DETAILED);
64 delegate->ShowIMESettings(); 64 WmShell::Get()->system_tray_controller()->ShowIMESettings();
65 } 65 }
66 66
67 class ImeMenuLabel : public views::Label { 67 class ImeMenuLabel : public views::Label {
68 public: 68 public:
69 ImeMenuLabel() {} 69 ImeMenuLabel() {}
70 ~ImeMenuLabel() override {} 70 ~ImeMenuLabel() override {}
71 71
72 // views:Label: 72 // views:Label:
73 gfx::Size GetPreferredSize() const override { 73 gfx::Size GetPreferredSize() const override {
74 const int tray_constant = GetTrayConstant(TRAY_IME_MENU_ICON); 74 const int tray_constant = GetTrayConstant(TRAY_IME_MENU_ICON);
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_); 529 WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
530 530
531 // Updates the tray label based on the current input method. 531 // Updates the tray label based on the current input method.
532 if (current_ime_.third_party) 532 if (current_ime_.third_party)
533 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); 533 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
534 else 534 else
535 label_->SetText(current_ime_.short_name); 535 label_->SetText(current_ime_.short_name);
536 } 536 }
537 537
538 } // namespace ash 538 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698