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 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
548 } | 548 } |
549 | 549 |
550 gfx::Rect BrowserView::GetClientAreaBounds() const { | 550 gfx::Rect BrowserView::GetClientAreaBounds() const { |
551 gfx::Rect container_bounds = contents_->bounds(); | 551 gfx::Rect container_bounds = contents_->bounds(); |
552 gfx::Point container_origin = container_bounds.origin(); | 552 gfx::Point container_origin = container_bounds.origin(); |
553 ConvertPointToView(this, GetParent(), &container_origin); | 553 ConvertPointToView(this, GetParent(), &container_origin); |
554 container_bounds.set_origin(container_origin); | 554 container_bounds.set_origin(container_origin); |
555 return container_bounds; | 555 return container_bounds; |
556 } | 556 } |
557 | 557 |
558 bool BrowserView::ShouldFindBarBlendWithBookmarksBar() const { | |
559 if (bookmark_bar_view_.get()) | |
560 return bookmark_bar_view_->IsAlwaysShown(); | |
561 return false; | |
562 } | |
563 | |
564 gfx::Rect BrowserView::GetFindBarBoundingBox() const { | 558 gfx::Rect BrowserView::GetFindBarBoundingBox() const { |
565 return GetBrowserViewLayout()->GetFindBarBoundingBox(); | 559 return GetBrowserViewLayout()->GetFindBarBoundingBox(); |
566 } | 560 } |
567 | 561 |
568 int BrowserView::GetTabStripHeight() const { | 562 int BrowserView::GetTabStripHeight() const { |
569 // We want to return tabstrip_->height(), but we might be called in the midst | 563 // We want to return tabstrip_->height(), but we might be called in the midst |
570 // of layout, when that hasn't yet been updated to reflect the current state. | 564 // of layout, when that hasn't yet been updated to reflect the current state. |
571 // So return what the tabstrip height _ought_ to be right now. | 565 // So return what the tabstrip height _ought_ to be right now. |
572 return IsTabStripVisible() ? tabstrip_->GetPreferredSize().height() : 0; | 566 return IsTabStripVisible() ? tabstrip_->GetPreferredSize().height() : 0; |
573 } | 567 } |
(...skipping 1894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2468 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); | 2462 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); |
2469 | 2463 |
2470 return view; | 2464 return view; |
2471 } | 2465 } |
2472 #endif | 2466 #endif |
2473 | 2467 |
2474 // static | 2468 // static |
2475 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2469 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2476 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2470 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2477 } | 2471 } |
OLD | NEW |