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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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/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/shell_port.h"
16 #include "ash/strings/grit/ash_strings.h" 17 #include "ash/strings/grit/ash_strings.h"
17 #include "ash/system/ime_menu/ime_list_view.h" 18 #include "ash/system/ime_menu/ime_list_view.h"
18 #include "ash/system/tray/system_menu_button.h" 19 #include "ash/system/tray/system_menu_button.h"
19 #include "ash/system/tray/system_tray_controller.h" 20 #include "ash/system/tray/system_tray_controller.h"
20 #include "ash/system/tray/system_tray_delegate.h" 21 #include "ash/system/tray/system_tray_delegate.h"
21 #include "ash/system/tray/system_tray_notifier.h" 22 #include "ash/system/tray/system_tray_notifier.h"
22 #include "ash/system/tray/tray_constants.h" 23 #include "ash/system/tray/tray_constants.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_window.h" 27 #include "ash/wm_window.h"
28 #include "base/metrics/histogram_macros.h" 28 #include "base/metrics/histogram_macros.h"
29 #include "base/strings/utf_string_conversions.h" 29 #include "base/strings/utf_string_conversions.h"
30 #include "ui/base/ime/chromeos/input_method_manager.h" 30 #include "ui/base/ime/chromeos/input_method_manager.h"
31 #include "ui/base/ime/ime_bridge.h" 31 #include "ui/base/ime/ime_bridge.h"
32 #include "ui/base/ime/text_input_client.h" 32 #include "ui/base/ime/text_input_client.h"
33 #include "ui/base/l10n/l10n_util.h" 33 #include "ui/base/l10n/l10n_util.h"
34 #include "ui/base/resource/resource_bundle.h" 34 #include "ui/base/resource/resource_bundle.h"
35 #include "ui/gfx/paint_vector_icon.h" 35 #include "ui/gfx/paint_vector_icon.h"
36 #include "ui/gfx/range/range.h" 36 #include "ui/gfx/range/range.h"
(...skipping 13 matching lines...) Expand all
50 // Returns the height range of ImeListView. 50 // Returns the height range of ImeListView.
51 gfx::Range GetImeListViewRange() { 51 gfx::Range GetImeListViewRange() {
52 const int max_items = 5; 52 const int max_items = 5;
53 const int min_items = 1; 53 const int min_items = 1;
54 const int tray_item_height = kTrayPopupItemMinHeight; 54 const int tray_item_height = kTrayPopupItemMinHeight;
55 return gfx::Range(tray_item_height * min_items, tray_item_height * max_items); 55 return gfx::Range(tray_item_height * min_items, tray_item_height * max_items);
56 } 56 }
57 57
58 // Shows language and input settings page. 58 // Shows language and input settings page.
59 void ShowIMESettings() { 59 void ShowIMESettings() {
60 WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SHOW_DETAILED); 60 ShellPort::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SHOW_DETAILED);
61 Shell::Get()->system_tray_controller()->ShowIMESettings(); 61 Shell::Get()->system_tray_controller()->ShowIMESettings();
62 } 62 }
63 63
64 // Records the number of times users click buttons in opt-in IME menu. 64 // Records the number of times users click buttons in opt-in IME menu.
65 void RecordButtonsClicked(const std::string& button_name) { 65 void RecordButtonsClicked(const std::string& button_name) {
66 enum { 66 enum {
67 UNKNOWN = 0, 67 UNKNOWN = 0,
68 EMOJI = 1, 68 EMOJI = 1,
69 HANDWRITING = 2, 69 HANDWRITING = 2,
70 VOICE = 3, 70 VOICE = 3,
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 Shell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_); 541 Shell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
542 542
543 // Updates the tray label based on the current input method. 543 // Updates the tray label based on the current input method.
544 if (current_ime_.third_party) 544 if (current_ime_.third_party)
545 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); 545 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
546 else 546 else
547 label_->SetText(current_ime_.short_name); 547 label_->SetText(current_ime_.short_name);
548 } 548 }
549 549
550 } // namespace ash 550 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698