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 1357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1368 if (!preview_container_) | 1368 if (!preview_container_) |
1369 return; | 1369 return; |
1370 | 1370 |
1371 // The contents must be changed before SetPreview is invoked. | 1371 // The contents must be changed before SetPreview is invoked. |
1372 preview_container_->ChangeTabContents(NULL); | 1372 preview_container_->ChangeTabContents(NULL); |
1373 contents_->SetPreview(NULL, NULL); | 1373 contents_->SetPreview(NULL, NULL); |
1374 delete preview_container_; | 1374 delete preview_container_; |
1375 preview_container_ = NULL; | 1375 preview_container_ = NULL; |
1376 } | 1376 } |
1377 | 1377 |
| 1378 gfx::Rect BrowserView::GetMatchPreviewBounds() { |
| 1379 return contents_->GetPreviewBounds(); |
| 1380 } |
| 1381 |
1378 /////////////////////////////////////////////////////////////////////////////// | 1382 /////////////////////////////////////////////////////////////////////////////// |
1379 // BrowserView, BrowserWindowTesting implementation: | 1383 // BrowserView, BrowserWindowTesting implementation: |
1380 | 1384 |
1381 BookmarkBarView* BrowserView::GetBookmarkBarView() const { | 1385 BookmarkBarView* BrowserView::GetBookmarkBarView() const { |
1382 return bookmark_bar_view_.get(); | 1386 return bookmark_bar_view_.get(); |
1383 } | 1387 } |
1384 | 1388 |
1385 LocationBarView* BrowserView::GetLocationBarView() const { | 1389 LocationBarView* BrowserView::GetLocationBarView() const { |
1386 return toolbar_->location_bar(); | 1390 return toolbar_->location_bar(); |
1387 } | 1391 } |
(...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2446 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); | 2450 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); |
2447 | 2451 |
2448 return view; | 2452 return view; |
2449 } | 2453 } |
2450 #endif | 2454 #endif |
2451 | 2455 |
2452 // static | 2456 // static |
2453 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2457 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
2454 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2458 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
2455 } | 2459 } |
OLD | NEW |