chrome/browser/ui/views/omnibox/omnibox_view_views.cc - Issue 7574021: Remove frontend code that allows for dynamic profile setting, and read the profile off the browse...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 7574021: Remove frontend code that allows for dynamic profile setting, and read the profile off the browse... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 4 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/bookmarks/bookmark_bar_view_test.cc ('K') | « chrome/browser/ui/views/location_bar/selected_keyword_view.h ('k') | chrome/browser/ui/views/omnibox/omnibox_view_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

===================================================================

--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc (revision 95527)

+++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc (working copy)

@@ -12,8 +12,6 @@

#include "chrome/browser/autocomplete/autocomplete_match.h"

#include "chrome/browser/autocomplete/autocomplete_popup_model.h"

#include "chrome/browser/command_updater.h"

-#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"

-#include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h"

#include "chrome/browser/ui/views/location_bar/location_bar_view.h"

#include "chrome/common/chrome_notification_types.h"

#include "content/browser/tab_contents/tab_contents.h"

@@ -32,6 +30,12 @@

#include "views/controls/textfield/textfield.h"

#include "views/layout/fill_layout.h"

+#if defined(TOUCH_UI)

+#include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h"

+#else

+#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"

+#endif

namespace {

// Textfield for autocomplete that intercepts events that are necessary

@@ -696,6 +700,6 @@

#else

typedef AutocompletePopupContentsView AutocompleteContentsView;

#endif

- return new AutocompleteContentsView(

- gfx::Font(), this, model_.get(), profile, location_bar);

+ return new AutocompleteContentsView(gfx::Font(), this, model_.get(),

+ location_bar);

}