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

Side by Side Diff: ui/views/controls/tabbed_pane/tabbed_pane.h

Issue 10797046: (Views only): Allow choosing between NativeTabbedPaneView and NativeTabbedPaneWin on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
OLDNEW
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 #ifndef UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_ 5 #ifndef UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
6 #define UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_ 6 #define UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 View* RemoveTabAtIndex(int index); 55 View* RemoveTabAtIndex(int index);
56 56
57 // Selects the tab at |index|, which must be valid. 57 // Selects the tab at |index|, which must be valid.
58 void SelectTabAt(int index); 58 void SelectTabAt(int index);
59 59
60 void SetAccessibleName(const string16& name); 60 void SetAccessibleName(const string16& name);
61 61
62 // Overridden from View: 62 // Overridden from View:
63 virtual gfx::Size GetPreferredSize() OVERRIDE; 63 virtual gfx::Size GetPreferredSize() OVERRIDE;
64 64
65 #if defined(OS_WIN) && !defined(USE_AURA)
66 bool use_native_win_control() { return use_native_win_control_; }
msw 2012/07/20 23:50:51 Move these up above the View override, potentially
markusheintz_ 2012/07/23 12:22:06 Done.
67 void set_use_native_win_control(bool use_native_win_control) {
68 use_native_win_control_ = use_native_win_control;
69 }
70 #endif
71
65 protected: 72 protected:
66 // The object that actually implements the tabbed-pane. 73 // The object that actually implements the tabbed-pane.
67 // Protected for tests access. 74 // Protected for tests access.
68 NativeTabbedPaneWrapper* native_tabbed_pane_; 75 NativeTabbedPaneWrapper* native_tabbed_pane_;
69 76
70 private: 77 private:
71 // The tabbed-pane's class name. 78 // The tabbed-pane's class name.
72 static const char kViewClassName[]; 79 static const char kViewClassName[];
73 80
74 // We support Ctrl+Tab and Ctrl+Shift+Tab to navigate tabbed option pages. 81 // We support Ctrl+Tab and Ctrl+Shift+Tab to navigate tabbed option pages.
(...skipping 10 matching lines...) Expand all
85 virtual void OnFocus() OVERRIDE; 92 virtual void OnFocus() OVERRIDE;
86 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE; 93 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
87 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 94 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
88 95
89 // Our listener. Not owned. Notified when tab selection changes. 96 // Our listener. Not owned. Notified when tab selection changes.
90 TabbedPaneListener* listener_; 97 TabbedPaneListener* listener_;
91 98
92 // The accessible name of this tabbed pane. 99 // The accessible name of this tabbed pane.
93 string16 accessible_name_; 100 string16 accessible_name_;
94 101
102 #if defined(OS_WIN) && !defined(USE_AURA)
103 bool use_native_win_control_;
104 #endif
105
95 DISALLOW_COPY_AND_ASSIGN(TabbedPane); 106 DISALLOW_COPY_AND_ASSIGN(TabbedPane);
96 }; 107 };
97 108
98 } // namespace views 109 } // namespace views
99 110
100 #endif // UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_ 111 #endif // UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698