| 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 877 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 888 frame_->GetWindow()->FrameTypeChanged(); | 888 frame_->GetWindow()->FrameTypeChanged(); |
| 889 GetRootView()->ThemeChanged(); | 889 GetRootView()->ThemeChanged(); |
| 890 GetRootView()->SchedulePaint(); | 890 GetRootView()->SchedulePaint(); |
| 891 } | 891 } |
| 892 | 892 |
| 893 int BrowserView::GetExtraRenderViewHeight() const { | 893 int BrowserView::GetExtraRenderViewHeight() const { |
| 894 // Currently this is only used on linux. | 894 // Currently this is only used on linux. |
| 895 return 0; | 895 return 0; |
| 896 } | 896 } |
| 897 | 897 |
| 898 void BrowserView::TabContentsFocused(TabContents* tab_contents) { |
| 899 contents_container_->TabContentsFocused(tab_contents); |
| 900 } |
| 901 |
| 898 /////////////////////////////////////////////////////////////////////////////// | 902 /////////////////////////////////////////////////////////////////////////////// |
| 899 // BrowserView, BrowserWindowTesting implementation: | 903 // BrowserView, BrowserWindowTesting implementation: |
| 900 | 904 |
| 901 BookmarkBarView* BrowserView::GetBookmarkBarView() const { | 905 BookmarkBarView* BrowserView::GetBookmarkBarView() const { |
| 902 return bookmark_bar_view_.get(); | 906 return bookmark_bar_view_.get(); |
| 903 } | 907 } |
| 904 | 908 |
| 905 LocationBarView* BrowserView::GetLocationBarView() const { | 909 LocationBarView* BrowserView::GetLocationBarView() const { |
| 906 return toolbar_->location_bar(); | 910 return toolbar_->location_bar(); |
| 907 } | 911 } |
| 908 | 912 |
| 913 views::View* BrowserView::GetTabContentsContainerView() const { |
| 914 return contents_container_->GetFocusView(); |
| 915 } |
| 916 |
| 909 /////////////////////////////////////////////////////////////////////////////// | 917 /////////////////////////////////////////////////////////////////////////////// |
| 910 // BrowserView, NotificationObserver implementation: | 918 // BrowserView, NotificationObserver implementation: |
| 911 | 919 |
| 912 void BrowserView::Observe(NotificationType type, | 920 void BrowserView::Observe(NotificationType type, |
| 913 const NotificationSource& source, | 921 const NotificationSource& source, |
| 914 const NotificationDetails& details) { | 922 const NotificationDetails& details) { |
| 915 if (type == NotificationType::PREF_CHANGED && | 923 if (type == NotificationType::PREF_CHANGED && |
| 916 *Details<std::wstring>(details).ptr() == prefs::kShowBookmarkBar) { | 924 *Details<std::wstring>(details).ptr() == prefs::kShowBookmarkBar) { |
| 917 if (MaybeShowBookmarkBar(browser_->GetSelectedTabContents())) | 925 if (MaybeShowBookmarkBar(browser_->GetSelectedTabContents())) |
| 918 Layout(); | 926 Layout(); |
| (...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1772 | 1780 |
| 1773 // static | 1781 // static |
| 1774 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 1782 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 1775 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 1783 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 1776 } | 1784 } |
| 1777 | 1785 |
| 1778 // static | 1786 // static |
| 1779 void BrowserList::AllBrowsersClosed() { | 1787 void BrowserList::AllBrowsersClosed() { |
| 1780 views::Window::CloseAllSecondaryWindows(); | 1788 views::Window::CloseAllSecondaryWindows(); |
| 1781 } | 1789 } |
| OLD | NEW |