Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side 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 unified diff | Download patch
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef VIEWS_CONTROLS_TABBED_PANE_H_ 5 #ifndef VIEWS_CONTROLS_TABBED_PANE_H_
6 #define VIEWS_CONTROLS_TABBED_PANE_H_ 6 #define VIEWS_CONTROLS_TABBED_PANE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 // We support Ctrl+Tab and Ctrl+Shift+Tab to navigate tabbed option pages. 79 // We support Ctrl+Tab and Ctrl+Shift+Tab to navigate tabbed option pages.
80 void LoadAccelerators(); 80 void LoadAccelerators();
81 81
82 // View: 82 // View:
83 virtual void Layout() OVERRIDE; 83 virtual void Layout() OVERRIDE;
84 virtual void ViewHierarchyChanged(bool is_add, 84 virtual void ViewHierarchyChanged(bool is_add,
85 View* parent, 85 View* parent,
86 View* child) OVERRIDE; 86 View* child) OVERRIDE;
87 // Handles Ctrl+Tab and Ctrl+Shift+Tab navigation of pages. 87 // Handles Ctrl+Tab and Ctrl+Shift+Tab navigation of pages.
88 virtual bool AcceleratorPressed( 88 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
89 const views::Accelerator& accelerator) OVERRIDE;
90 virtual std::string GetClassName() const OVERRIDE; 89 virtual std::string GetClassName() const OVERRIDE;
91 virtual void OnFocus() OVERRIDE; 90 virtual void OnFocus() OVERRIDE;
92 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE; 91 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
93 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 92 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
94 93
95 // The listener we notify about tab selection changes. 94 // The listener we notify about tab selection changes.
96 TabbedPaneListener* listener_; 95 TabbedPaneListener* listener_;
97 96
98 // The accessible name of this view. 97 // The accessible name of this view.
99 string16 accessible_name_; 98 string16 accessible_name_;
100 99
101 DISALLOW_COPY_AND_ASSIGN(TabbedPane); 100 DISALLOW_COPY_AND_ASSIGN(TabbedPane);
102 }; 101 };
103 102
104 } // namespace views 103 } // namespace views
105 104
106 #endif // VIEWS_CONTROLS_TABBED_PANE_H_ 105 #endif // VIEWS_CONTROLS_TABBED_PANE_H_
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698