OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "chrome/browser/views/frame/browser_view.h" | 5 #include "chrome/browser/views/frame/browser_view.h" |
6 | 6 |
7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 1683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1694 } | 1694 } |
1695 | 1695 |
1696 void BrowserView::InitTabStrip(TabStripModel* model) { | 1696 void BrowserView::InitTabStrip(TabStripModel* model) { |
1697 // Throw away the existing tabstrip if we're switching display modes. | 1697 // Throw away the existing tabstrip if we're switching display modes. |
1698 if (tabstrip_) { | 1698 if (tabstrip_) { |
1699 tabstrip_->GetParent()->RemoveChildView(tabstrip_); | 1699 tabstrip_->GetParent()->RemoveChildView(tabstrip_); |
1700 delete tabstrip_; | 1700 delete tabstrip_; |
1701 } | 1701 } |
1702 | 1702 |
1703 BrowserTabStripController* tabstrip_controller = | 1703 BrowserTabStripController* tabstrip_controller = |
1704 new BrowserTabStripController(model); | 1704 new BrowserTabStripController(browser_.get(), model); |
1705 | 1705 |
1706 if (UseVerticalTabs()) | 1706 if (UseVerticalTabs()) |
1707 tabstrip_ = new SideTabStrip(tabstrip_controller); | 1707 tabstrip_ = new SideTabStrip(tabstrip_controller); |
1708 else | 1708 else |
1709 tabstrip_ = new TabStrip(tabstrip_controller); | 1709 tabstrip_ = new TabStrip(tabstrip_controller); |
1710 | 1710 |
1711 tabstrip_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP)); | 1711 tabstrip_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP)); |
1712 AddChildView(tabstrip_); | 1712 AddChildView(tabstrip_); |
1713 | 1713 |
1714 tabstrip_controller->InitFromModel(tabstrip_); | 1714 tabstrip_controller->InitFromModel(tabstrip_); |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2239 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); | 2239 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); |
2240 | 2240 |
2241 return view; | 2241 return view; |
2242 } | 2242 } |
2243 #endif | 2243 #endif |
2244 | 2244 |
2245 // static | 2245 // static |
2246 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2246 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2247 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2247 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2248 } | 2248 } |
OLD | NEW |