| 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 1783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1794 } | 1794 } |
| 1795 | 1795 |
| 1796 void BrowserView::InitTabStrip(TabStripModel* model) { | 1796 void BrowserView::InitTabStrip(TabStripModel* model) { |
| 1797 // Throw away the existing tabstrip if we're switching display modes. | 1797 // Throw away the existing tabstrip if we're switching display modes. |
| 1798 if (tabstrip_) { | 1798 if (tabstrip_) { |
| 1799 tabstrip_->GetParent()->RemoveChildView(tabstrip_); | 1799 tabstrip_->GetParent()->RemoveChildView(tabstrip_); |
| 1800 delete tabstrip_; | 1800 delete tabstrip_; |
| 1801 } | 1801 } |
| 1802 | 1802 |
| 1803 BrowserTabStripController* tabstrip_controller = | 1803 BrowserTabStripController* tabstrip_controller = |
| 1804 new BrowserTabStripController(model); | 1804 new BrowserTabStripController(browser_.get(), model); |
| 1805 | 1805 |
| 1806 if (UseVerticalTabs()) | 1806 if (UseVerticalTabs()) |
| 1807 tabstrip_ = new SideTabStrip(tabstrip_controller); | 1807 tabstrip_ = new SideTabStrip(tabstrip_controller); |
| 1808 else | 1808 else |
| 1809 tabstrip_ = new TabStrip(tabstrip_controller); | 1809 tabstrip_ = new TabStrip(tabstrip_controller); |
| 1810 | 1810 |
| 1811 tabstrip_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP)); | 1811 tabstrip_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP)); |
| 1812 AddChildView(tabstrip_); | 1812 AddChildView(tabstrip_); |
| 1813 | 1813 |
| 1814 tabstrip_controller->InitFromModel(tabstrip_); | 1814 tabstrip_controller->InitFromModel(tabstrip_); |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2401 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); | 2401 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); |
| 2402 | 2402 |
| 2403 return view; | 2403 return view; |
| 2404 } | 2404 } |
| 2405 #endif | 2405 #endif |
| 2406 | 2406 |
| 2407 // static | 2407 // static |
| 2408 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2408 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2409 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2409 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2410 } | 2410 } |
| OLD | NEW |