| OLD | NEW |
| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 LOCAL_ENTRY, | 51 LOCAL_ENTRY, |
| 52 REMOTE_ENTRY, | 52 REMOTE_ENTRY, |
| 53 COMBINED_ENTRY | 53 COMBINED_ENTRY |
| 54 }; | 54 }; |
| 55 | 55 |
| 56 HistoryEntry(EntryType type, const GURL& url, const base::string16& title, | 56 HistoryEntry(EntryType type, const GURL& url, const base::string16& title, |
| 57 base::Time time, const std::string& client_id, | 57 base::Time time, const std::string& client_id, |
| 58 bool is_search_result, const base::string16& snippet, | 58 bool is_search_result, const base::string16& snippet, |
| 59 bool blocked_visit, const std::string& accept_languages); | 59 bool blocked_visit, const std::string& accept_languages); |
| 60 HistoryEntry(); | 60 HistoryEntry(); |
| 61 HistoryEntry(const HistoryEntry& other); |
| 61 virtual ~HistoryEntry(); | 62 virtual ~HistoryEntry(); |
| 62 | 63 |
| 63 // Formats this entry's URL and title and adds them to |result|. | 64 // Formats this entry's URL and title and adds them to |result|. |
| 64 void SetUrlAndTitle(base::DictionaryValue* result) const; | 65 void SetUrlAndTitle(base::DictionaryValue* result) const; |
| 65 | 66 |
| 66 // Converts the entry to a DictionaryValue to be owned by the caller. | 67 // Converts the entry to a DictionaryValue to be owned by the caller. |
| 67 scoped_ptr<base::DictionaryValue> ToValue( | 68 scoped_ptr<base::DictionaryValue> ToValue( |
| 68 bookmarks::BookmarkModel* bookmark_model, | 69 bookmarks::BookmarkModel* bookmark_model, |
| 69 SupervisedUserService* supervised_user_service, | 70 SupervisedUserService* supervised_user_service, |
| 70 const ProfileSyncService* sync_service) const; | 71 const ProfileSyncService* sync_service) const; |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 | 217 |
| 217 ScopedObserver<history::HistoryService, history::HistoryServiceObserver> | 218 ScopedObserver<history::HistoryService, history::HistoryServiceObserver> |
| 218 history_service_observer_; | 219 history_service_observer_; |
| 219 | 220 |
| 220 base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_; | 221 base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_; |
| 221 | 222 |
| 222 DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler); | 223 DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler); |
| 223 }; | 224 }; |
| 224 | 225 |
| 225 #endif // CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_ | 226 #endif // CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_ |
| OLD | NEW |