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

Side by Side Diff: chrome/browser/search_engines/template_url.h

Issue 343523003: Remove AutocompleteInput Type and PageClassification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 6 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
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_SEARCH_ENGINES_TEMPLATE_URL_H_ 5 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
6 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_ 6 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "chrome/browser/autocomplete/autocomplete_input.h" 15 #include "components/metrics/proto/omnibox_event.pb.h"
16 #include "components/metrics/proto/omnibox_input_type.pb.h"
16 #include "components/search_engines/template_url_data.h" 17 #include "components/search_engines/template_url_data.h"
17 #include "components/search_engines/template_url_id.h" 18 #include "components/search_engines/template_url_id.h"
18 #include "ui/gfx/size.h" 19 #include "ui/gfx/size.h"
19 #include "url/gurl.h" 20 #include "url/gurl.h"
20 #include "url/url_parse.h" 21 #include "url/url_parse.h"
21 22
22 class Profile; 23 class Profile;
23 class SearchTermsData; 24 class SearchTermsData;
24 class TemplateURL; 25 class TemplateURL;
25 26
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 std::string encoding; 106 std::string encoding;
106 }; 107 };
107 108
108 // The search terms (query). 109 // The search terms (query).
109 base::string16 search_terms; 110 base::string16 search_terms;
110 111
111 // The original (input) query. 112 // The original (input) query.
112 base::string16 original_query; 113 base::string16 original_query;
113 114
114 // The type the original input query was identified as. 115 // The type the original input query was identified as.
115 AutocompleteInput::Type input_type; 116 metrics::OmniboxInputType::Type input_type;
116 117
117 // The optional assisted query stats, aka AQS, used for logging purposes. 118 // The optional assisted query stats, aka AQS, used for logging purposes.
118 // This string contains impressions of all autocomplete matches shown 119 // This string contains impressions of all autocomplete matches shown
119 // at the query submission time. For privacy reasons, we require the 120 // at the query submission time. For privacy reasons, we require the
120 // search provider to support HTTPS protocol in order to receive the AQS 121 // search provider to support HTTPS protocol in order to receive the AQS
121 // param. 122 // param.
122 // For more details, see http://goto.google.com/binary-clients-logging . 123 // For more details, see http://goto.google.com/binary-clients-logging .
123 std::string assisted_query_stats; 124 std::string assisted_query_stats;
124 125
125 // TODO: Remove along with "aq" CGI param. 126 // TODO: Remove along with "aq" CGI param.
126 int accepted_suggestion; 127 int accepted_suggestion;
127 128
128 // The 0-based position of the cursor within the query string at the time 129 // The 0-based position of the cursor within the query string at the time
129 // the request was issued. Set to base::string16::npos if not used. 130 // the request was issued. Set to base::string16::npos if not used.
130 size_t cursor_position; 131 size_t cursor_position;
131 132
132 // The start-edge margin of the omnibox in pixels, used in extended Instant 133 // The start-edge margin of the omnibox in pixels, used in extended Instant
133 // to align the preview contents with the omnibox. 134 // to align the preview contents with the omnibox.
134 int omnibox_start_margin; 135 int omnibox_start_margin;
135 136
136 // The URL of the current webpage to be used for experimental zero-prefix 137 // The URL of the current webpage to be used for experimental zero-prefix
137 // suggestions. 138 // suggestions.
138 std::string current_page_url; 139 std::string current_page_url;
139 140
140 // Which omnibox the user used to type the prefix. 141 // Which omnibox the user used to type the prefix.
141 AutocompleteInput::PageClassification page_classification; 142 metrics::OmniboxEventProto::PageClassification page_classification;
142 143
143 // True for searches issued with the bookmark bar pref set to shown. 144 // True for searches issued with the bookmark bar pref set to shown.
144 bool bookmark_bar_pinned; 145 bool bookmark_bar_pinned;
145 146
146 // Optional session token. 147 // Optional session token.
147 std::string session_token; 148 std::string session_token;
148 149
149 // Additional query params provided by the suggest server. 150 // Additional query params provided by the suggest server.
150 std::string suggest_query_params; 151 std::string suggest_query_params;
151 152
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 TemplateURLRef new_tab_url_ref_; 691 TemplateURLRef new_tab_url_ref_;
691 TemplateURLRef contextual_search_url_ref_; 692 TemplateURLRef contextual_search_url_ref_;
692 scoped_ptr<AssociatedExtensionInfo> extension_info_; 693 scoped_ptr<AssociatedExtensionInfo> extension_info_;
693 694
694 // TODO(sky): Add date last parsed OSD file. 695 // TODO(sky): Add date last parsed OSD file.
695 696
696 DISALLOW_COPY_AND_ASSIGN(TemplateURL); 697 DISALLOW_COPY_AND_ASSIGN(TemplateURL);
697 }; 698 };
698 699
699 #endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_ 700 #endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698