ash/content/keyboard_overlay/keyboard_overlay_view.cc - Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen 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/content/keyboard_overlay/keyboard_overlay_view.cc

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc ('k') | ash/desktop_background/desktop_background_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/content/keyboard_overlay/keyboard_overlay_view.h"	5 #include "ash/content/keyboard_overlay/keyboard_overlay_view.h"

6	6

7 #include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"	7 #include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"

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

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

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

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

12 #include "ui/events/event.h"	12 #include "ui/events/event.h"

13 #include "ui/gfx/screen.h"

14 #include "ui/views/widget/widget.h"	13 #include "ui/views/widget/widget.h"

15 #include "ui/web_dialogs/web_dialog_delegate.h"	14 #include "ui/web_dialogs/web_dialog_delegate.h"

16	15

17 using ui::WebDialogDelegate;	16 using ui::WebDialogDelegate;

18	17

19 namespace {	18 namespace {

20	19

21 // Keys to invoke Cancel (Escape, Ctrl+Alt+/, or Shift+Ctrl+Alt+/, Help, F14).	20 // Keys to invoke Cancel (Escape, Ctrl+Alt+/, or Shift+Ctrl+Alt+/, Help, F14).

22 const ash::KeyboardOverlayView::KeyEventData kCancelKeys[] = {	21 const ash::KeyboardOverlayView::KeyEventData kCancelKeys[] = {

23 {ui::VKEY_ESCAPE, ui::EF_NONE},	22 {ui::VKEY_ESCAPE, ui::EF_NONE},

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 // static	86 // static

88 void KeyboardOverlayView::GetCancelingKeysForTesting(	87 void KeyboardOverlayView::GetCancelingKeysForTesting(

89 std::vector<KeyboardOverlayView::KeyEventData>* canceling_keys) {	88 std::vector<KeyboardOverlayView::KeyEventData>* canceling_keys) {

90 CHECK(canceling_keys);	89 CHECK(canceling_keys);

91 canceling_keys->clear();	90 canceling_keys->clear();

92 for (size_t i = 0; i < arraysize(kCancelKeys); ++i)	91 for (size_t i = 0; i < arraysize(kCancelKeys); ++i)

93 canceling_keys->push_back(kCancelKeys[i]);	92 canceling_keys->push_back(kCancelKeys[i]);

94 }	93 }

95	94

96 } // namespace ash	95 } // namespace ash

OLD	NEW