ash/system/ime_menu/ime_menu_tray.cc - Issue 2920613003: Clean up unused grit header includes in ash/.

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 2920613003: Clean up unused grit header includes in ash/. (Closed)

Patch Set: Created 3 years, 6 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/system/ime_menu/ime_list_view.cc ('k') | ash/system/palette/common_palette_tool.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/resources/grit/ash_resources.h"

10 #include "ash/root_window_controller.h"	9 #include "ash/root_window_controller.h"

11 #include "ash/session/session_controller.h"	10 #include "ash/session/session_controller.h"

12 #include "ash/shelf/shelf.h"	11 #include "ash/shelf/shelf.h"

13 #include "ash/shell.h"	12 #include "ash/shell.h"

14 #include "ash/shell_port.h"	13 #include "ash/shell_port.h"

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

16 #include "ash/system/ime_menu/ime_list_view.h"	15 #include "ash/system/ime_menu/ime_list_view.h"

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

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

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

(...skipping 524 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
544 else	543 else

545 label_->SetText(current_ime_.short_name);	544 label_->SetText(current_ime_.short_name);

546 }	545 }

547	546

548 void ImeMenuTray::DisableVirtualKeyboard() {	547 void ImeMenuTray::DisableVirtualKeyboard() {

549 Shell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(false);	548 Shell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(false);

550 force_show_keyboard_ = false;	549 force_show_keyboard_ = false;

551 }	550 }

552	551

553 } // namespace ash	552 } // namespace ash

OLD	NEW