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

Side by Side Diff: chrome/browser/autocomplete/autocomplete_input.h

Issue 21395002: [InstantExtended] Fixing how PageLoadSRP is emitted. Previously it was emitted only for Instant sea… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: this time actually fixing merge error correctly Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/metrics/metrics_log.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_ 5 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_
6 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_ 6 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // The user is on a search result page that's doing search term 61 // The user is on a search result page that's doing search term
62 // replacement, meaning the search terms should've appeared in the omnibox 62 // replacement, meaning the search terms should've appeared in the omnibox
63 // before the user started editing it, not the URL of the page. 63 // before the user started editing it, not the URL of the page.
64 SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT = 6, 64 SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT = 6,
65 // The new tab page in which this omnibox interaction first started 65 // The new tab page in which this omnibox interaction first started
66 // with the user having focus in the omnibox. 66 // with the user having focus in the omnibox.
67 INSTANT_NEW_TAB_PAGE_WITH_OMNIBOX_AS_STARTING_FOCUS = 7, 67 INSTANT_NEW_TAB_PAGE_WITH_OMNIBOX_AS_STARTING_FOCUS = 7,
68 // The new tab page in which this omnibox interaction first started 68 // The new tab page in which this omnibox interaction first started
69 // with the user having focus in the fakebox. 69 // with the user having focus in the fakebox.
70 INSTANT_NEW_TAB_PAGE_WITH_FAKEBOX_AS_STARTING_FOCUS = 8, 70 INSTANT_NEW_TAB_PAGE_WITH_FAKEBOX_AS_STARTING_FOCUS = 8,
71 // The user is on a search result page that's not doing search term
72 // replacement, meaning the URL of the page should've appeared in the
73 // omnibox before the user started editing it, not the search terms.
74 SEARCH_RESULT_PAGE_NO_SEARCH_TERM_REPLACEMENT = 9
71 }; 75 };
72 76
73 AutocompleteInput(); 77 AutocompleteInput();
74 // |text| and |cursor_position| represent the input query and location of 78 // |text| and |cursor_position| represent the input query and location of
75 // the cursor with the query respectively. |cursor_position| may be set to 79 // the cursor with the query respectively. |cursor_position| may be set to
76 // string16::npos if the input |text| doesn't come directly from the user's 80 // string16::npos if the input |text| doesn't come directly from the user's
77 // typing. 81 // typing.
78 // 82 //
79 // |desired_tld| is the user's desired TLD, if one is not already present in 83 // |desired_tld| is the user's desired TLD, if one is not already present in
80 // the text to autocomplete. When this is non-empty, it also implies that 84 // the text to autocomplete. When this is non-empty, it also implies that
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 url_parse::Parsed parts_; 231 url_parse::Parsed parts_;
228 string16 scheme_; 232 string16 scheme_;
229 GURL canonicalized_url_; 233 GURL canonicalized_url_;
230 bool prevent_inline_autocomplete_; 234 bool prevent_inline_autocomplete_;
231 bool prefer_keyword_; 235 bool prefer_keyword_;
232 bool allow_exact_keyword_match_; 236 bool allow_exact_keyword_match_;
233 MatchesRequested matches_requested_; 237 MatchesRequested matches_requested_;
234 }; 238 };
235 239
236 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_ 240 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/metrics/metrics_log.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698