ash/common/system/chromeos/ime_menu/ime_menu_tray.cc - Issue 2625843002: Folds WmRootWindowController into RootWindowController

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

Issue 2625843002: Folds WmRootWindowController into RootWindowController (Closed)

Patch Set: definition in wm_root_window_controller.cc 2 Created 3 years, 11 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:

OLD	NEW
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"

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"	13 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h"

14 #include "ash/common/system/tray/fixed_sized_scroll_view.h"	14 #include "ash/common/system/tray/fixed_sized_scroll_view.h"

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

16 #include "ash/common/system/tray/system_menu_button.h"	16 #include "ash/common/system/tray/system_menu_button.h"

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

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

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

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

21 #include "ash/common/system/tray/tray_popup_item_style.h"	21 #include "ash/common/system/tray/tray_popup_item_style.h"

22 #include "ash/common/system/tray/tray_popup_utils.h"	22 #include "ash/common/system/tray/tray_popup_utils.h"

23 #include "ash/common/system/tray/tray_utils.h"	23 #include "ash/common/system/tray/tray_utils.h"

24 #include "ash/common/wm_lookup.h"	24 #include "ash/common/wm_lookup.h"

25 #include "ash/common/wm_root_window_controller.h"

26 #include "ash/common/wm_shell.h"	25 #include "ash/common/wm_shell.h"

27 #include "ash/common/wm_window.h"	26 #include "ash/common/wm_window.h"

28 #include "ash/public/cpp/shell_window_ids.h"	27 #include "ash/public/cpp/shell_window_ids.h"

	28 #include "ash/root_window_controller.h"

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

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

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

32 #include "ui/base/ime/chromeos/input_method_manager.h"	32 #include "ui/base/ime/chromeos/input_method_manager.h"

33 #include "ui/base/ime/ime_bridge.h"	33 #include "ui/base/ime/ime_bridge.h"

34 #include "ui/base/ime/text_input_client.h"	34 #include "ui/base/ime/text_input_client.h"

35 #include "ui/base/l10n/l10n_util.h"	35 #include "ui/base/l10n/l10n_util.h"

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

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

38 #include "ui/gfx/range/range.h"	38 #include "ui/gfx/range/range.h"

(...skipping 598 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
637 WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);	637 WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);

638	638

639 // Updates the tray label based on the current input method.	639 // Updates the tray label based on the current input method.

640 if (current_ime_.third_party)	640 if (current_ime_.third_party)

641 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));	641 label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));

642 else	642 else

643 label_->SetText(current_ime_.short_name);	643 label_->SetText(current_ime_.short_name);

644 }	644 }

645	645

646 } // namespace ash	646 } // namespace ash

OLD	NEW