ash/system/ime/tray_ime_chromeos.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

Side by Side Diff: ash/system/ime/tray_ime_chromeos.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: 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:

« no previous file with comments | « ash/system/enterprise/tray_enterprise.cc ('k') | ash/system/ime/tray_ime_chromeos_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/tray_ime_chromeos.h"	5 #include "ash/system/ime/tray_ime_chromeos.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "ash/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"

	11 #include "ash/common/wm_shell.h"

10 #include "ash/resources/grit/ash_resources.h"	12 #include "ash/resources/grit/ash_resources.h"

11 #include "ash/resources/vector_icons/vector_icons.h"	13 #include "ash/resources/vector_icons/vector_icons.h"

12 #include "ash/session/session_state_delegate.h"

13 #include "ash/strings/grit/ash_strings.h"	14 #include "ash/strings/grit/ash_strings.h"

14 #include "ash/system/tray/hover_highlight_view.h"	15 #include "ash/system/tray/hover_highlight_view.h"

15 #include "ash/system/tray/system_tray.h"	16 #include "ash/system/tray/system_tray.h"

16 #include "ash/system/tray/system_tray_controller.h"	17 #include "ash/system/tray/system_tray_controller.h"

17 #include "ash/system/tray/system_tray_delegate.h"	18 #include "ash/system/tray/system_tray_delegate.h"

18 #include "ash/system/tray/system_tray_notifier.h"	19 #include "ash/system/tray/system_tray_notifier.h"

19 #include "ash/system/tray/tray_constants.h"	20 #include "ash/system/tray/tray_constants.h"

20 #include "ash/system/tray/tray_details_view.h"	21 #include "ash/system/tray/tray_details_view.h"

21 #include "ash/system/tray/tray_item_more.h"	22 #include "ash/system/tray/tray_item_more.h"

22 #include "ash/system/tray/tray_item_view.h"	23 #include "ash/system/tray/tray_item_view.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/system/tray/tri_view.h"	27 #include "ash/system/tray/tri_view.h"

27 #include "ash/system/tray_accessibility.h"	28 #include "ash/system/tray_accessibility.h"

28 #include "ash/wm_shell.h"

29 #include "base/logging.h"	29 #include "base/logging.h"

30 #include "base/strings/utf_string_conversions.h"	30 #include "base/strings/utf_string_conversions.h"

31 #include "ui/accessibility/ax_enums.h"	31 #include "ui/accessibility/ax_enums.h"

32 #include "ui/accessibility/ax_node_data.h"	32 #include "ui/accessibility/ax_node_data.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/font.h"	35 #include "ui/gfx/font.h"

36 #include "ui/gfx/image/image.h"	36 #include "ui/gfx/image/image.h"

37 #include "ui/gfx/paint_vector_icon.h"	37 #include "ui/gfx/paint_vector_icon.h"

38 #include "ui/keyboard/keyboard_util.h"	38 #include "ui/keyboard/keyboard_util.h"

(...skipping 337 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
376 return ime_count >= threshold;	376 return ime_count >= threshold;

377 }	377 }

378	378

379 ImeListView::SingleImeBehavior TrayIME::GetSingleImeBehavior() {	379 ImeListView::SingleImeBehavior TrayIME::GetSingleImeBehavior() {

380 // If managed, we also want to show a single IME.	380 // If managed, we also want to show a single IME.

381 return IsIMEManaged() ? ImeListView::SHOW_SINGLE_IME	381 return IsIMEManaged() ? ImeListView::SHOW_SINGLE_IME

382 : ImeListView::HIDE_SINGLE_IME;	382 : ImeListView::HIDE_SINGLE_IME;

383 }	383 }

384	384

385 } // namespace ash	385 } // namespace ash

OLD	NEW