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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase 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
« no previous file with comments | « ash/system/ime_menu/ime_menu_tray.h ('k') | ash/system/ime_menu/ime_menu_tray_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/system/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"
14 #include "ash/common/system/tray/hover_highlight_view.h"
15 #include "ash/common/system/tray/system_menu_button.h"
16 #include "ash/common/system/tray/system_tray_controller.h"
17 #include "ash/common/system/tray/system_tray_delegate.h"
18 #include "ash/common/system/tray/system_tray_notifier.h"
19 #include "ash/common/system/tray/tray_constants.h"
20 #include "ash/common/system/tray/tray_popup_item_style.h"
21 #include "ash/common/system/tray/tray_popup_utils.h"
22 #include "ash/common/system/tray/tray_utils.h"
23 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
24 #include "ash/common/wm_window.h" 14 #include "ash/common/wm_window.h"
25 #include "ash/public/cpp/shell_window_ids.h" 15 #include "ash/public/cpp/shell_window_ids.h"
26 #include "ash/resources/grit/ash_resources.h" 16 #include "ash/resources/grit/ash_resources.h"
27 #include "ash/root_window_controller.h" 17 #include "ash/root_window_controller.h"
28 #include "ash/strings/grit/ash_strings.h" 18 #include "ash/strings/grit/ash_strings.h"
19 #include "ash/system/ime_menu/ime_list_view.h"
20 #include "ash/system/tray/hover_highlight_view.h"
21 #include "ash/system/tray/system_menu_button.h"
22 #include "ash/system/tray/system_tray_controller.h"
23 #include "ash/system/tray/system_tray_delegate.h"
24 #include "ash/system/tray/system_tray_notifier.h"
25 #include "ash/system/tray/tray_constants.h"
26 #include "ash/system/tray/tray_popup_item_style.h"
27 #include "ash/system/tray/tray_popup_utils.h"
28 #include "ash/system/tray/tray_utils.h"
29 #include "base/metrics/histogram_macros.h" 29 #include "base/metrics/histogram_macros.h"
30 #include "base/strings/utf_string_conversions.h" 30 #include "base/strings/utf_string_conversions.h"
31 #include "ui/base/ime/chromeos/input_method_manager.h" 31 #include "ui/base/ime/chromeos/input_method_manager.h"
32 #include "ui/base/ime/ime_bridge.h" 32 #include "ui/base/ime/ime_bridge.h"
33 #include "ui/base/ime/text_input_client.h" 33 #include "ui/base/ime/text_input_client.h"
34 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
35 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 #include "ui/gfx/paint_vector_icon.h" 36 #include "ui/gfx/paint_vector_icon.h"
37 #include "ui/gfx/range/range.h" 37 #include "ui/gfx/range/range.h"
38 #include "ui/gfx/vector_icons_public.h" 38 #include "ui/gfx/vector_icons_public.h"
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_); 641 WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
642 642
643 // Updates the tray label based on the current input method. 643 // Updates the tray label based on the current input method.
644 if (current_ime_.third_party) 644 if (current_ime_.third_party)
645 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); 645 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
646 else 646 else
647 label_->SetText(current_ime_.short_name); 647 label_->SetText(current_ime_.short_name);
648 } 648 }
649 649
650 } // namespace ash 650 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/ime_menu/ime_menu_tray.h ('k') | ash/system/ime_menu/ime_menu_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698