ash/common/system/ime/tray_ime_chromeos.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: cleanup test Created 4 years, 5 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/common/system/date/tray_date.cc ('k') | ash/common/system/status_area_widget.h » ('j') | ash/common/system/tray/system_tray_unittest.cc » ('J')

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/common/system/ime/tray_ime_chromeos.h"	5 #include "ash/common/system/ime/tray_ime_chromeos.h"

6	6

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

8	8

9 #include "ash/common/session/session_state_delegate.h"	9 #include "ash/common/session/session_state_delegate.h"

10 #include "ash/common/system/tray/hover_highlight_view.h"	10 #include "ash/common/system/tray/hover_highlight_view.h"

	11 #include "ash/common/system/tray/system_tray.h"

11 #include "ash/common/system/tray/system_tray_delegate.h"	12 #include "ash/common/system/tray/system_tray_delegate.h"

12 #include "ash/common/system/tray/system_tray_notifier.h"	13 #include "ash/common/system/tray/system_tray_notifier.h"

13 #include "ash/common/system/tray/tray_constants.h"	14 #include "ash/common/system/tray/tray_constants.h"

14 #include "ash/common/system/tray/tray_details_view.h"	15 #include "ash/common/system/tray/tray_details_view.h"

15 #include "ash/common/system/tray/tray_item_more.h"	16 #include "ash/common/system/tray/tray_item_more.h"

16 #include "ash/common/system/tray/tray_item_view.h"	17 #include "ash/common/system/tray/tray_item_view.h"

17 #include "ash/common/system/tray/tray_utils.h"	18 #include "ash/common/system/tray/tray_utils.h"

18 #include "ash/common/system/tray_accessibility.h"	19 #include "ash/common/system/tray_accessibility.h"

19 #include "ash/common/wm_shell.h"	20 #include "ash/common/wm_shell.h"

20 #include "ash/system/tray/system_tray.h"

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

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

23 #include "grit/ash_resources.h"	23 #include "grit/ash_resources.h"

24 #include "grit/ash_strings.h"	24 #include "grit/ash_strings.h"

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

26 #include "ui/accessibility/ax_view_state.h"	26 #include "ui/accessibility/ax_view_state.h"

27 #include "ui/base/resource/resource_bundle.h"	27 #include "ui/base/resource/resource_bundle.h"

28 #include "ui/gfx/font.h"	28 #include "ui/gfx/font.h"

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

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

(...skipping 335 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
366 else	366 else

367 Update();	367 Update();

368 }	368 }

369	369

370 bool TrayIME::ShouldDefaultViewBeVisible() {	370 bool TrayIME::ShouldDefaultViewBeVisible() {

371 return is_visible_ && (ime_list_.size() > 1 \|\| property_list_.size() > 1 \|\|	371 return is_visible_ && (ime_list_.size() > 1 \|\| property_list_.size() > 1 \|\|

372 ShouldShowKeyboardToggle());	372 ShouldShowKeyboardToggle());

373 }	373 }

374	374

375 } // namespace ash	375 } // namespace ash

OLD	NEW