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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: ui/views/controls/tabbed_pane/tabbed_pane.h
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.h b/ui/views/controls/tabbed_pane/tabbed_pane.h
index 348acf6391ddd6c073f6639670b6b038c3a595a7..2cd5a5fa942b8e4ec3a379d8e0c72d674bd8cc50 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane.h
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.h
@@ -62,6 +62,13 @@ class VIEWS_EXPORT TabbedPane : public View {
// Overridden from View:
virtual gfx::Size GetPreferredSize() OVERRIDE;
+#if defined(OS_WIN) && !defined(USE_AURA)
+ 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.
+ void set_use_native_win_control(bool use_native_win_control) {
+ use_native_win_control_ = use_native_win_control;
+ }
+#endif
+
protected:
// The object that actually implements the tabbed-pane.
// Protected for tests access.
@@ -92,6 +99,10 @@ class VIEWS_EXPORT TabbedPane : public View {
// The accessible name of this tabbed pane.
string16 accessible_name_;
+#if defined(OS_WIN) && !defined(USE_AURA)
+ bool use_native_win_control_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(TabbedPane);
};

Powered by Google App Engine
This is Rietveld 408576698