| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #if defined(TOOLKIT_USES_GTK) | 7 #if defined(TOOLKIT_USES_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1354 | 1354 |
| 1355 gfx::Rect BrowserView::GetInstantBounds() { | 1355 gfx::Rect BrowserView::GetInstantBounds() { |
| 1356 return contents_->GetPreviewBounds(); | 1356 return contents_->GetPreviewBounds(); |
| 1357 } | 1357 } |
| 1358 | 1358 |
| 1359 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( | 1359 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( |
| 1360 const gfx::Rect& bounds) { | 1360 const gfx::Rect& bounds) { |
| 1361 return NEW_POPUP; | 1361 return NEW_POPUP; |
| 1362 } | 1362 } |
| 1363 | 1363 |
| 1364 FindBar* BrowserView::CreateFindBar() { |
| 1365 return browser::CreateFindBar(this); |
| 1366 } |
| 1367 |
| 1364 #if defined(OS_CHROMEOS) | 1368 #if defined(OS_CHROMEOS) |
| 1365 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { | 1369 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { |
| 1366 KeyboardOverlayDialogView::ShowDialog(owning_window, this); | 1370 KeyboardOverlayDialogView::ShowDialog(owning_window, this); |
| 1367 } | 1371 } |
| 1368 #endif | 1372 #endif |
| 1369 | 1373 |
| 1370 /////////////////////////////////////////////////////////////////////////////// | 1374 /////////////////////////////////////////////////////////////////////////////// |
| 1371 // BrowserView, BrowserWindowTesting implementation: | 1375 // BrowserView, BrowserWindowTesting implementation: |
| 1372 | 1376 |
| 1373 BookmarkBarView* BrowserView::GetBookmarkBarView() const { | 1377 BookmarkBarView* BrowserView::GetBookmarkBarView() const { |
| (...skipping 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2652 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2656 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
| 2653 // Create the view and the frame. The frame will attach itself via the view | 2657 // Create the view and the frame. The frame will attach itself via the view |
| 2654 // so we don't need to do anything with the pointer. | 2658 // so we don't need to do anything with the pointer. |
| 2655 BrowserView* view = new BrowserView(browser); | 2659 BrowserView* view = new BrowserView(browser); |
| 2656 (new BrowserFrame(view))->InitBrowserFrame(); | 2660 (new BrowserFrame(view))->InitBrowserFrame(); |
| 2657 view->GetWidget()->non_client_view()->SetAccessibleName( | 2661 view->GetWidget()->non_client_view()->SetAccessibleName( |
| 2658 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2662 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2659 return view; | 2663 return view; |
| 2660 } | 2664 } |
| 2661 #endif | 2665 #endif |
| 2662 | |
| 2663 // static | |
| 2664 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | |
| 2665 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | |
| 2666 } | |
| OLD | NEW |