ash/system/ime_menu/ime_menu_tray.cc - Issue 2844563003: chromeos: Remove wm_shelf_util.h

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2844563003: chromeos: Remove wm_shelf_util.h (Closed)

Patch Set: rebase Created 3 years, 8 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/shelf/wm_shelf_util.cc ('k') | ash/system/network/tray_network.cc » ('j') | no next file with comments »

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/system/ime_menu/ime_menu_tray.h"	5 #include "ash/system/ime_menu/ime_menu_tray.h"

6	6

7 #include "ash/accessibility_delegate.h"	7 #include "ash/accessibility_delegate.h"

8 #include "ash/ash_constants.h"	8 #include "ash/ash_constants.h"

9 #include "ash/public/cpp/shell_window_ids.h"	9 #include "ash/public/cpp/shell_window_ids.h"

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

11 #include "ash/root_window_controller.h"	11 #include "ash/root_window_controller.h"

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

13 #include "ash/shelf/wm_shelf.h"	13 #include "ash/shelf/wm_shelf.h"

14 #include "ash/shelf/wm_shelf_util.h"

15 #include "ash/shell.h"	14 #include "ash/shell.h"

16 #include "ash/shell_port.h"	15 #include "ash/shell_port.h"

17 #include "ash/strings/grit/ash_strings.h"	16 #include "ash/strings/grit/ash_strings.h"

18 #include "ash/system/ime_menu/ime_list_view.h"	17 #include "ash/system/ime_menu/ime_list_view.h"

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

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

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

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

23 #include "ash/system/tray/tray_constants.h"	22 #include "ash/system/tray/tray_constants.h"

24 #include "ash/system/tray/tray_container.h"	23 #include "ash/system/tray/tray_container.h"

(...skipping 528 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
553 Shell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);	552 Shell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);

554	553

555 // Updates the tray label based on the current input method.	554 // Updates the tray label based on the current input method.

556 if (current_ime_.third_party)	555 if (current_ime_.third_party)

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

558 else	557 else

559 label_->SetText(current_ime_.short_name);	558 label_->SetText(current_ime_.short_name);

560 }	559 }

561	560

562 } // namespace ash	561 } // namespace ash

OLD	NEW