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 872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
883 browser_.reset(); | 883 browser_.reset(); |
884 } | 884 } |
885 | 885 |
886 bool BrowserView::IsBookmarkBarVisible() const { | 886 bool BrowserView::IsBookmarkBarVisible() const { |
887 return browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR) && | 887 return browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR) && |
888 active_bookmark_bar_ && | 888 active_bookmark_bar_ && |
889 (active_bookmark_bar_->GetPreferredSize().height() != 0); | 889 (active_bookmark_bar_->GetPreferredSize().height() != 0); |
890 } | 890 } |
891 | 891 |
892 bool BrowserView::IsBookmarkBarAnimating() const { | 892 bool BrowserView::IsBookmarkBarAnimating() const { |
893 if (bookmark_bar_view_.get() && | 893 return bookmark_bar_view_.get() && bookmark_bar_view_->is_animating(); |
894 bookmark_bar_view_->IsAnimating()) | |
895 return true; | |
896 return false; | |
897 } | 894 } |
898 | 895 |
899 bool BrowserView::IsToolbarVisible() const { | 896 bool BrowserView::IsToolbarVisible() const { |
900 return browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) || | 897 return browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) || |
901 browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR); | 898 browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR); |
902 } | 899 } |
903 | 900 |
904 gfx::Rect BrowserView::GetRootWindowResizerRect() const { | 901 gfx::Rect BrowserView::GetRootWindowResizerRect() const { |
905 if (frame_->GetWindow()->IsMaximized() || frame_->GetWindow()->IsFullscreen()) | 902 if (frame_->GetWindow()->IsMaximized() || frame_->GetWindow()->IsFullscreen()) |
906 return gfx::Rect(); | 903 return gfx::Rect(); |
(...skipping 1313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2220 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); | 2217 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); |
2221 | 2218 |
2222 return view; | 2219 return view; |
2223 } | 2220 } |
2224 #endif | 2221 #endif |
2225 | 2222 |
2226 // static | 2223 // static |
2227 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2224 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2228 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2225 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2229 } | 2226 } |
OLD | NEW |