| Index: ui/views/controls/tabbed_pane/tabbed_pane.cc
|
| diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc
|
| index 1bbac8e7177af36671152271a97ed2067a353688..ebfebc7bb875f21c227f504465237af7e6ca00cc 100644
|
| --- a/ui/views/controls/tabbed_pane/tabbed_pane.cc
|
| +++ b/ui/views/controls/tabbed_pane/tabbed_pane.cc
|
| @@ -22,12 +22,13 @@
|
| namespace {
|
|
|
| views::NativeTabbedPaneWrapper* CreateNativeWrapper(
|
| - views::TabbedPane* tabbed_pane) {
|
| + views::TabbedPane* tabbed_pane,
|
| + bool use_chrome_style) {
|
| #if defined(OS_WIN) && !defined(USE_AURA)
|
| if (tabbed_pane->use_native_win_control())
|
| return new views::NativeTabbedPaneWin(tabbed_pane);
|
| #endif
|
| - return new views::NativeTabbedPaneViews(tabbed_pane);
|
| + return new views::NativeTabbedPaneViews(tabbed_pane, use_chrome_style);
|
| }
|
|
|
| } // namespace
|
| @@ -37,12 +38,13 @@ namespace views {
|
| // static
|
| const char TabbedPane::kViewClassName[] = "views/TabbedPane";
|
|
|
| -TabbedPane::TabbedPane()
|
| +TabbedPane::TabbedPane(bool use_chrome_style)
|
| : native_tabbed_pane_(NULL),
|
| #if defined(OS_WIN) && !defined(USE_AURA)
|
| use_native_win_control_(false),
|
| #endif
|
| - listener_(NULL) {
|
| + listener_(NULL),
|
| + use_chrome_style_(use_chrome_style) {
|
| set_focusable(true);
|
| }
|
|
|
| @@ -111,7 +113,7 @@ void TabbedPane::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
|
| if (is_add && !native_tabbed_pane_) {
|
| // The native wrapper's lifetime will be managed by the view hierarchy after
|
| // we call AddChildView.
|
| - native_tabbed_pane_ = CreateNativeWrapper(this);
|
| + native_tabbed_pane_ = CreateNativeWrapper(this, use_chrome_style_);
|
| AddChildView(native_tabbed_pane_->GetView());
|
| LoadAccelerators();
|
| }
|
|
|