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

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: Fix Popup tests for ChromeOS. Created 9 years, 8 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 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after
1177 preview_container_->ChangeTabContents(NULL); 1177 preview_container_->ChangeTabContents(NULL);
1178 contents_->SetPreview(NULL, NULL); 1178 contents_->SetPreview(NULL, NULL);
1179 delete preview_container_; 1179 delete preview_container_;
1180 preview_container_ = NULL; 1180 preview_container_ = NULL;
1181 } 1181 }
1182 1182
1183 gfx::Rect BrowserView::GetInstantBounds() { 1183 gfx::Rect BrowserView::GetInstantBounds() {
1184 return contents_->GetPreviewBounds(); 1184 return contents_->GetPreviewBounds();
1185 } 1185 }
1186 1186
1187 void BrowserView::AdjustNavigateParams(browser::NavigateParams* params) {
1188 }
1189
1187 #if defined(OS_CHROMEOS) 1190 #if defined(OS_CHROMEOS)
1188 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) { 1191 void BrowserView::ShowKeyboardOverlay(gfx::NativeWindow owning_window) {
1189 KeyboardOverlayDialogView::ShowDialog(owning_window, this); 1192 KeyboardOverlayDialogView::ShowDialog(owning_window, this);
1190 } 1193 }
1191 #endif 1194 #endif
1192 1195
1193 /////////////////////////////////////////////////////////////////////////////// 1196 ///////////////////////////////////////////////////////////////////////////////
1194 // BrowserView, BrowserWindowTesting implementation: 1197 // BrowserView, BrowserWindowTesting implementation:
1195 1198
1196 BookmarkBarView* BrowserView::GetBookmarkBarView() const { 1199 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
(...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after
2416 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 2419 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
2417 2420
2418 return view; 2421 return view;
2419 } 2422 }
2420 #endif 2423 #endif
2421 2424
2422 // static 2425 // static
2423 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2426 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2424 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2427 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2425 } 2428 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698