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

Side by Side Diff: chrome/browser/ui/webui/browsing_history_handler.h

Issue 1838333004: Add a notice about other forms of browsing history to the History WebUI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@desktop-ui-after-rebase
Patch Set: Moved build dependencies to OS!=iOS Created 4 years, 8 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 const history::QueryOptions& options, 155 const history::QueryOptions& options,
156 history::QueryResults* results); 156 history::QueryResults* results);
157 157
158 // Callback from the WebHistoryService when a query has completed. 158 // Callback from the WebHistoryService when a query has completed.
159 void WebHistoryQueryComplete(const base::string16& search_text, 159 void WebHistoryQueryComplete(const base::string16& search_text,
160 const history::QueryOptions& options, 160 const history::QueryOptions& options,
161 base::TimeTicks start_time, 161 base::TimeTicks start_time,
162 history::WebHistoryService::Request* request, 162 history::WebHistoryService::Request* request,
163 const base::DictionaryValue* results_value); 163 const base::DictionaryValue* results_value);
164 164
165 // Callback telling us whether other forms of browsing history were found
166 // on the history server.
167 void OtherFormsOfBrowsingHistoryQueryComplete(
168 bool foundOtherFormsOfBrowsingHistory);
Dan Beam 2016/03/31 01:05:44 cpp_vars_like_this
msramek 2016/03/31 19:20:02 Done. Yep, switching between C++ and Java...
169
165 // Callback from the history system when visits were deleted. 170 // Callback from the history system when visits were deleted.
166 void RemoveComplete(); 171 void RemoveComplete();
167 172
168 // Callback from history server when visits were deleted. 173 // Callback from history server when visits were deleted.
169 void RemoveWebHistoryComplete(bool success); 174 void RemoveWebHistoryComplete(bool success);
170 175
171 bool ExtractIntegerValueAtIndex( 176 bool ExtractIntegerValueAtIndex(
172 const base::ListValue* value, int index, int* out_int); 177 const base::ListValue* value, int index, int* out_int);
173 178
174 // Sets the query options for a week-wide query, |offset| weeks ago. 179 // Sets the query options for a week-wide query, |offset| weeks ago.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 216
212 // The list of query results received from the history server. 217 // The list of query results received from the history server.
213 std::vector<HistoryEntry> web_history_query_results_; 218 std::vector<HistoryEntry> web_history_query_results_;
214 219
215 // Timer used to implement a timeout on a Web History response. 220 // Timer used to implement a timeout on a Web History response.
216 base::OneShotTimer web_history_timer_; 221 base::OneShotTimer web_history_timer_;
217 222
218 ScopedObserver<history::HistoryService, history::HistoryServiceObserver> 223 ScopedObserver<history::HistoryService, history::HistoryServiceObserver>
219 history_service_observer_; 224 history_service_observer_;
220 225
226 // Whether the last call to Web History returned synced results.
227 bool has_synced_results_;
228
229 // Whether there are other forms of browsing history on the history server.
230 bool has_other_forms_of_browsing_history_;
231
221 base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_; 232 base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_;
222 233
223 DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler); 234 DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler);
224 }; 235 };
225 236
226 #endif // CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_ 237 #endif // CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698