chrome/browser/ui/views/keyboard_overlay_dialog_view.cc - Issue 10823017: Revert 148383 - Move the keyboard overlay view to 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: chrome/browser/ui/views/keyboard_overlay_dialog_view.cc

Issue 10823017: Revert 148383 - Move the keyboard overlay view to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 4 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 | Annotate | Revision Log

Property Changes:

Added: svn:mergeinfo

« no previous file with comments | « chrome/browser/ui/views/keyboard_overlay_dialog_view.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

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 "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"	5 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/utf_string_conversions.h"

8 #include "chrome/browser/ui/views/keyboard_overlay_delegate.h"	8 #include "chrome/browser/ui/views/keyboard_overlay_delegate.h"

9 #include "content/public/browser/browser_context.h"	9 #include "content/public/browser/browser_context.h"

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

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 g_instance = view;	56 g_instance = view;

57 }	57 }

58	58

59 void KeyboardOverlayDialogView::WindowClosing() {	59 void KeyboardOverlayDialogView::WindowClosing() {

60 #if defined(OS_CHROMEOS)	60 #if defined(OS_CHROMEOS)

61 // Re-enable the IME accelerators. See the comment in ShowDialog() above.	61 // Re-enable the IME accelerators. See the comment in ShowDialog() above.

62 chromeos::input_method::InputMethodManager::GetInstance()->EnableHotkeys();	62 chromeos::input_method::InputMethodManager::GetInstance()->EnableHotkeys();

63 #endif	63 #endif

64 g_instance = NULL;	64 g_instance = NULL;

65 }	65 }

OLD	NEW