Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 55 // version; it could be replaced by an extension. | 55 // version; it could be replaced by an extension. |
| 56 BLANK = 2, // about:blank | 56 BLANK = 2, // about:blank |
| 57 HOMEPAGE = 3, // user switched settings to "open this page" mode. | 57 HOMEPAGE = 3, // user switched settings to "open this page" mode. |
| 58 // Note that if the homepage is set to the new tab page or about blank, | 58 // Note that if the homepage is set to the new tab page or about blank, |
| 59 // then we'll classify the web page into those categories, not HOMEPAGE. | 59 // then we'll classify the web page into those categories, not HOMEPAGE. |
| 60 OTHER = 4, // everything not included somewhere else on this list | 60 OTHER = 4, // everything not included somewhere else on this list |
| 61 INSTANT_NEW_TAB_PAGE = 5, // new tab page rendered by Instant | 61 INSTANT_NEW_TAB_PAGE = 5, // new tab page rendered by Instant |
| 62 // The user is on a search result page that's doing search term | 62 // The user is on a search result page that's doing search term |
| 63 // replacement, meaning the search terms should've appeared in the omnibox | 63 // replacement, meaning the search terms should've appeared in the omnibox |
| 64 // before the user started editing it, not the URL of the page. | 64 // before the user started editing it, not the URL of the page. |
| 65 SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT = 6 | 65 SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT = 6, |
| 66 » // The user in a search result page that's not doing search term | |
|
Mark P
2013/08/06 19:38:36
nit: horizontal spacing
ditto in proto file
Peter Kasting
2013/08/06 21:32:19
Also, grammar (in both places). "The user in"?
rpetterson
2013/08/06 23:04:17
Done. In the proto file as well.
rpetterson
2013/08/06 23:04:17
Done.
| |
| 67 // replacement, meaning the URL of the page shows in the omnibox. | |
|
Mark P
2013/08/06 19:38:36
minor nit: consider ending the sentence with a sim
rpetterson
2013/08/06 23:04:17
Done. In the proto file as well.
| |
| 68 SEARCH_RESULT_PAGE_NOT_DOING_SEARCH_TERM_REPLACEMENT = 7 | |
|
Mark P
2013/08/06 19:38:36
Note: you will have to resolve against
https://cod
rpetterson
2013/08/06 23:04:17
I will do a separate rebase upload after the uploa
| |
| 66 }; | 69 }; |
|
Mark P
2013/08/06 19:38:36
As you added an entry here, you need to add the tr
rpetterson
2013/08/06 23:04:17
Done.
| |
| 67 | 70 |
| 68 AutocompleteInput(); | 71 AutocompleteInput(); |
| 69 // |text| and |cursor_position| represent the input query and location of | 72 // |text| and |cursor_position| represent the input query and location of |
| 70 // the cursor with the query respectively. |cursor_position| may be set to | 73 // the cursor with the query respectively. |cursor_position| may be set to |
| 71 // string16::npos if the input |text| doesn't come directly from the user's | 74 // string16::npos if the input |text| doesn't come directly from the user's |
| 72 // typing. | 75 // typing. |
| 73 // | 76 // |
| 74 // |desired_tld| is the user's desired TLD, if one is not already present in | 77 // |desired_tld| is the user's desired TLD, if one is not already present in |
| 75 // the text to autocomplete. When this is non-empty, it also implies that | 78 // the text to autocomplete. When this is non-empty, it also implies that |
| 76 // "www." should be prepended to the domain where possible. The |desired_tld| | 79 // "www." should be prepended to the domain where possible. The |desired_tld| |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 222 url_parse::Parsed parts_; | 225 url_parse::Parsed parts_; |
| 223 string16 scheme_; | 226 string16 scheme_; |
| 224 GURL canonicalized_url_; | 227 GURL canonicalized_url_; |
| 225 bool prevent_inline_autocomplete_; | 228 bool prevent_inline_autocomplete_; |
| 226 bool prefer_keyword_; | 229 bool prefer_keyword_; |
| 227 bool allow_exact_keyword_match_; | 230 bool allow_exact_keyword_match_; |
| 228 MatchesRequested matches_requested_; | 231 MatchesRequested matches_requested_; |
| 229 }; | 232 }; |
| 230 | 233 |
| 231 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_ | 234 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_ |
| OLD | NEW |