OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1428 toolbar_ = new ToolbarView(browser_.get()); | 1428 toolbar_ = new ToolbarView(browser_.get()); |
1429 AddChildView(toolbar_); | 1429 AddChildView(toolbar_); |
1430 toolbar_->SetID(VIEW_ID_TOOLBAR); | 1430 toolbar_->SetID(VIEW_ID_TOOLBAR); |
1431 toolbar_->Init(browser_->profile()); | 1431 toolbar_->Init(browser_->profile()); |
1432 toolbar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TOOLBAR)); | 1432 toolbar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TOOLBAR)); |
1433 | 1433 |
1434 infobar_container_ = new InfoBarContainer(this); | 1434 infobar_container_ = new InfoBarContainer(this); |
1435 AddChildView(infobar_container_); | 1435 AddChildView(infobar_container_); |
1436 | 1436 |
1437 contents_container_ = new TabContentsContainer; | 1437 contents_container_ = new TabContentsContainer; |
1438 set_contents_view(contents_container_); | |
1439 | |
1440 devtools_container_ = new TabContentsContainer; | 1438 devtools_container_ = new TabContentsContainer; |
1441 contents_split_ = new views::SingleSplitView( | 1439 contents_split_ = new views::SingleSplitView( |
1442 contents_container_, | 1440 contents_container_, |
1443 devtools_container_, | 1441 devtools_container_, |
1444 views::SingleSplitView::VERTICAL_SPLIT); | 1442 views::SingleSplitView::VERTICAL_SPLIT); |
1445 | |
1446 AddChildView(contents_split_); | 1443 AddChildView(contents_split_); |
| 1444 set_contents_view(contents_split_); |
1447 | 1445 |
1448 status_bubble_.reset(new StatusBubbleViews(GetWidget())); | 1446 status_bubble_.reset(new StatusBubbleViews(GetWidget())); |
1449 | 1447 |
1450 extension_shelf_ = new ExtensionShelf(browser_.get()); | 1448 extension_shelf_ = new ExtensionShelf(browser_.get()); |
1451 AddChildView(extension_shelf_); | 1449 AddChildView(extension_shelf_); |
1452 | 1450 |
1453 #if defined(OS_WIN) | 1451 #if defined(OS_WIN) |
1454 InitSystemMenu(); | 1452 InitSystemMenu(); |
1455 #endif | 1453 #endif |
1456 } | 1454 } |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1851 | 1849 |
1852 // static | 1850 // static |
1853 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 1851 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
1854 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 1852 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
1855 } | 1853 } |
1856 | 1854 |
1857 // static | 1855 // static |
1858 void BrowserList::AllBrowsersClosed() { | 1856 void BrowserList::AllBrowsersClosed() { |
1859 views::Window::CloseAllSecondaryWindows(); | 1857 views::Window::CloseAllSecondaryWindows(); |
1860 } | 1858 } |
OLD | NEW |