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

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

Issue 2733823003: Move final vector icons out of ui/gfx/vector_icons/ and remove the (Closed)
Patch Set: fix cast shell maybe 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"
(...skipping 17 matching lines...) Expand all
28 #include "ash/strings/grit/ash_strings.h" 28 #include "ash/strings/grit/ash_strings.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"
39 #include "ui/keyboard/keyboard_controller.h" 38 #include "ui/keyboard/keyboard_controller.h"
40 #include "ui/keyboard/keyboard_util.h" 39 #include "ui/keyboard/keyboard_util.h"
41 #include "ui/views/controls/button/button.h" 40 #include "ui/views/controls/button/button.h"
42 #include "ui/views/controls/label.h" 41 #include "ui/views/controls/label.h"
43 #include "ui/views/controls/scroll_view.h" 42 #include "ui/views/controls/scroll_view.h"
44 #include "ui/views/controls/separator.h" 43 #include "ui/views/controls/separator.h"
45 #include "ui/views/layout/box_layout.h" 44 #include "ui/views/layout/box_layout.h"
46 45
47 using chromeos::input_method::InputMethodManager; 46 using chromeos::input_method::InputMethodManager;
48 47
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_); 640 WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
642 641
643 // Updates the tray label based on the current input method. 642 // Updates the tray label based on the current input method.
644 if (current_ime_.third_party) 643 if (current_ime_.third_party)
645 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*")); 644 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
646 else 645 else
647 label_->SetText(current_ime_.short_name); 646 label_->SetText(current_ime_.short_name);
648 } 647 }
649 648
650 } // namespace ash 649 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698