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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7834048: Preliminary work to allow Chrome to build with USE_AURA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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
« chrome/browser/ui/views/find_bar_host.cc ('K') | « chrome/browser/ui/views/infobars/infobar_view.cc ('k') | chrome/browser/ui/views/notifications/balloon_view_host.cc » ('j') | chrome/browser/ui/views/task_manager_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/location_bar_view.cc (revision 99456)
+++ chrome/browser/ui/views/location_bar/location_bar_view.cc (working copy)
@@ -176,7 +176,12 @@
// URL edit field.
// View container for URL edit field.
Profile* profile = browser_->profile();
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+ OmniboxViewViews* omnibox_view = new OmniboxViewViews(this, model_, profile,
+ browser_->command_updater(), mode_ == POPUP, this);
+ omnibox_view->Init();
+ location_entry_.reset(omnibox_view);
+#elif defined(OS_WIN)
if (views::Widget::IsPureViews()) {
OmniboxViewViews* omnibox_view = new OmniboxViewViews(this, model_, profile,
browser_->command_updater(), mode_ == POPUP, this);
« chrome/browser/ui/views/find_bar_host.cc ('K') | « chrome/browser/ui/views/infobars/infobar_view.cc ('k') | chrome/browser/ui/views/notifications/balloon_view_host.cc » ('j') | chrome/browser/ui/views/task_manager_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698