Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(983)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 6881073: Cleanup popup related browser navigation code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and merge with avi's popup block changes. Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1213 preview_container_->ChangeTabContents(NULL); 1213 preview_container_->ChangeTabContents(NULL);
1214 contents_->SetPreview(NULL, NULL); 1214 contents_->SetPreview(NULL, NULL);
1215 delete preview_container_; 1215 delete preview_container_;
1216 preview_container_ = NULL; 1216 preview_container_ = NULL;
1217 } 1217 }
1218 1218
1219 gfx::Rect BrowserView::GetInstantBounds() { 1219 gfx::Rect BrowserView::GetInstantBounds() {
1220 return contents_->GetPreviewBounds(); 1220 return contents_->GetPreviewBounds();
1221 } 1221 }
1222 1222
1223 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds(
1224 const gfx::Rect& bounds) {
1225 return NEW_POPUP;
1226 }
1227
1223 #if defined(OS_CHROMEOS) 1228 #if defined(OS_CHROMEOS)
1224 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { 1229 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) {
1225 KeyboardOverlayDialogView::ShowDialog(owning_window, this); 1230 KeyboardOverlayDialogView::ShowDialog(owning_window, this);
1226 } 1231 }
1227 #endif 1232 #endif
1228 1233
1229 /////////////////////////////////////////////////////////////////////////////// 1234 ///////////////////////////////////////////////////////////////////////////////
1230 // BrowserView, BrowserWindowTesting implementation: 1235 // BrowserView, BrowserWindowTesting implementation:
1231 1236
1232 BookmarkBarView* BrowserView::GetBookmarkBarView() const { 1237 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
(...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after
2452 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 2457 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
2453 2458
2454 return view; 2459 return view;
2455 } 2460 }
2456 #endif 2461 #endif
2457 2462
2458 // static 2463 // static
2459 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2464 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2460 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2465 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2461 } 2466 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698