views/controls/tabbed_pane/tabbed_pane.h - Issue 8508055: Move views::Accelerator to ui in order to use it from aura code.

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

Unified Diff: views/controls/tabbed_pane/tabbed_pane.h

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase Created 9 years, 1 month 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 side-by-side diff with in-line comments

Download patch

Index: views/controls/tabbed_pane/tabbed_pane.h

diff --git a/views/controls/tabbed_pane/tabbed_pane.h b/views/controls/tabbed_pane/tabbed_pane.h

index d9d51df642a84dda086d30d1d989b5674fa2c8af..6161d763f53424b57fc77ac87cf1fa5fdd1bc284 100644

--- a/views/controls/tabbed_pane/tabbed_pane.h

+++ b/views/controls/tabbed_pane/tabbed_pane.h

@@ -85,8 +85,7 @@ class VIEWS_EXPORT TabbedPane : public View {

View* parent,

View* child) OVERRIDE;

// Handles Ctrl+Tab and Ctrl+Shift+Tab navigation of pages.

- virtual bool AcceleratorPressed(

- const views::Accelerator& accelerator) OVERRIDE;

+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;

virtual std::string GetClassName() const OVERRIDE;

virtual void OnFocus() OVERRIDE;

virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;

« no previous file with comments | « views/controls/message_box_view.cc ('k') | views/controls/tabbed_pane/tabbed_pane.cc » ('j') | no next file with comments »