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

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

Issue 12386019: Instant: Use only one hidden WebContents per profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/omnibox/omnibox_view_win.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index 09db17b12ab065ac87abcaff464af0f753fa79ba..d1483cfbfedc613d0ac4822451783bd3d655bf5f 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -297,7 +297,6 @@ void OmniboxViewWin::EditDropTarget::ResetDropHighlights() {
edit_->SetDropHighlightPosition(-1);
}
-
///////////////////////////////////////////////////////////////////////////////
// Helper classes
@@ -1518,7 +1517,6 @@ LRESULT OmniboxViewWin::OnImeComposition(UINT message,
return result;
}
-
LRESULT OmniboxViewWin::OnImeEndComposition(UINT message, WPARAM wparam,
LPARAM lparam) {
// The edit control auto-clears the selection on WM_IME_ENDCOMPOSITION, which
@@ -1750,7 +1748,6 @@ void OmniboxViewWin::OnLButtonDown(UINT keys, const CPoint& point) {
if (!gaining_focus_.get() && !is_triple_click)
OnPossibleDrag(point);
-
// Modifying the selection counts as accepting any inline autocompletion, so
// track "changes" made by clicking the mouse button.
ScopedFreeze freeze(this, GetTextObjectModel());
@@ -2462,9 +2459,6 @@ void OmniboxViewWin::EmphasizeURLComponents() {
GetText(), model()->GetDesiredTLD(), &scheme, &host);
const bool emphasize = model()->CurrentTextIsURL() && (host.len > 0);
- bool instant_extended_api_enabled =
- chrome::search::IsInstantExtendedAPIEnabled(parent_view_->profile());
-
// Set the baseline emphasis.
CHARFORMAT cf = {0};
cf.dwMask = CFM_COLOR;
@@ -2589,9 +2583,6 @@ void OmniboxViewWin::DrawSlashForInsecureScheme(HDC hdc,
SkIntToScalar(PosFromChar(sel.cpMax).x - scheme_rect.left),
SkIntToScalar(scheme_rect.Height()) };
- bool instant_extended_api_enabled =
- chrome::search::IsInstantExtendedAPIEnabled(parent_view_->profile());
-
// Draw the unselected portion of the stroke.
sk_canvas->save();
if (selection_rect.isEmpty() ||

Powered by Google App Engine
This is Rietveld 408576698