| 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_UI_WEBUI_HISTORY_UI_H_ | 5 #ifndef CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_ |
| 6 #define CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_ | 6 #define CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 // The info value that is returned to the front end with the query results. | 200 // The info value that is returned to the front end with the query results. |
| 201 base::DictionaryValue results_info_value_; | 201 base::DictionaryValue results_info_value_; |
| 202 | 202 |
| 203 // The list of query results received from the history service. | 203 // The list of query results received from the history service. |
| 204 std::vector<HistoryEntry> query_results_; | 204 std::vector<HistoryEntry> query_results_; |
| 205 | 205 |
| 206 // The list of query results received from the history server. | 206 // The list of query results received from the history server. |
| 207 std::vector<HistoryEntry> web_history_query_results_; | 207 std::vector<HistoryEntry> web_history_query_results_; |
| 208 | 208 |
| 209 // Timer used to implement a timeout on a Web History response. | 209 // Timer used to implement a timeout on a Web History response. |
| 210 base::OneShotTimer<BrowsingHistoryHandler> web_history_timer_; | 210 base::OneShotTimer web_history_timer_; |
| 211 | 211 |
| 212 ScopedObserver<history::HistoryService, history::HistoryServiceObserver> | 212 ScopedObserver<history::HistoryService, history::HistoryServiceObserver> |
| 213 history_service_observer_; | 213 history_service_observer_; |
| 214 | 214 |
| 215 base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_; | 215 base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_; |
| 216 | 216 |
| 217 DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler); | 217 DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler); |
| 218 }; | 218 }; |
| 219 | 219 |
| 220 class HistoryUI : public content::WebUIController { | 220 class HistoryUI : public content::WebUIController { |
| 221 public: | 221 public: |
| 222 explicit HistoryUI(content::WebUI* web_ui); | 222 explicit HistoryUI(content::WebUI* web_ui); |
| 223 ~HistoryUI() override; | 223 ~HistoryUI() override; |
| 224 | 224 |
| 225 static base::RefCountedMemory* GetFaviconResourceBytes( | 225 static base::RefCountedMemory* GetFaviconResourceBytes( |
| 226 ui::ScaleFactor scale_factor); | 226 ui::ScaleFactor scale_factor); |
| 227 | 227 |
| 228 private: | 228 private: |
| 229 DISALLOW_COPY_AND_ASSIGN(HistoryUI); | 229 DISALLOW_COPY_AND_ASSIGN(HistoryUI); |
| 230 }; | 230 }; |
| 231 | 231 |
| 232 #endif // CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_ | 232 #endif // CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_ |
| OLD | NEW |