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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 10580039: Adds ability to render omnibox as a view above the page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index a3315690367a312cdec6eeb51564b9eb171562f3..a8d2c7bf2fdde519cebf28e3ed0ada96f88ad215 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -193,7 +193,7 @@ LocationBarView::~LocationBarView() {
template_url_service_->RemoveObserver(this);
}
-void LocationBarView::Init() {
+void LocationBarView::Init(views::View* popup_parent_view) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
if (mode_ == POPUP) {
font_ = rb.GetFont(ui::ResourceBundle::BaseFont);
@@ -222,7 +222,7 @@ void LocationBarView::Init() {
// URL edit field.
// View container for URL edit field.
location_entry_.reset(CreateOmniboxView(this, model_, profile_,
- command_updater_, mode_ == POPUP, this));
+ command_updater_, mode_ == POPUP, this, popup_parent_view));
SetLocationEntryFocusable(true);
location_entry_view_ = location_entry_->AddToView(this);

Powered by Google App Engine
This is Rietveld 408576698