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

Unified Diff: chrome/browser/ui/omnibox/omnibox_edit_model.cc

Issue 12330154: Merge 182244 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/omnibox/omnibox_edit_model.cc
===================================================================
--- chrome/browser/ui/omnibox/omnibox_edit_model.cc (revision 184740)
+++ chrome/browser/ui/omnibox/omnibox_edit_model.cc (working copy)
@@ -573,6 +573,7 @@
// open).
if (popup_->IsOpen()) {
const base::TimeTicks& now(base::TimeTicks::Now());
+ const content::WebContents* web_contents = controller_->GetWebContents();
// TODO(sreeram): Handle is_temporary_text_set_by_instant_ correctly.
AutocompleteLog log(
autocomplete_controller_->input().text(),
@@ -580,7 +581,8 @@
autocomplete_controller_->input().type(),
popup_->selected_line(),
-1, // don't yet know tab ID; set later if appropriate
- ClassifyPage(controller_->GetWebContents()->GetURL()),
+ web_contents ? ClassifyPage(web_contents->GetURL()) :
+ metrics::OmniboxEventProto_PageClassification_OTHER,
now - time_user_first_modified_omnibox_,
string16::npos, // completed_length; possibly set later
now - autocomplete_controller_->last_time_default_match_changed(),
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698