| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "chrome/browser/history/history_backend.h" | 5 #include "chrome/browser/history/history_backend.h" |
| 6 | 6 |
| 7 #include <list> |
| 8 #include <map> |
| 7 #include <set> | 9 #include <set> |
| 10 #include <vector> |
| 8 | 11 |
| 9 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 10 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 11 #include "base/file_util.h" | 14 #include "base/file_util.h" |
| 12 #include "base/metrics/histogram.h" | 15 #include "base/metrics/histogram.h" |
| 13 #include "base/message_loop.h" | 16 #include "base/message_loop.h" |
| 14 #include "base/scoped_ptr.h" | 17 #include "base/scoped_ptr.h" |
| 15 #include "base/scoped_vector.h" | 18 #include "base/scoped_vector.h" |
| 16 #include "base/string_util.h" | 19 #include "base/string_util.h" |
| 17 #include "base/time.h" | 20 #include "base/time.h" |
| 18 #include "chrome/browser/autocomplete/history_url_provider.h" | 21 #include "chrome/browser/autocomplete/history_url_provider.h" |
| 19 #include "chrome/browser/bookmarks/bookmark_service.h" | 22 #include "chrome/browser/bookmarks/bookmark_service.h" |
| 20 #include "chrome/browser/history/download_create_info.h" | 23 #include "chrome/browser/history/download_create_info.h" |
| 21 #include "chrome/browser/history/history_notifications.h" | 24 #include "chrome/browser/history/history_notifications.h" |
| 22 #include "chrome/browser/history/history_publisher.h" | 25 #include "chrome/browser/history/history_publisher.h" |
| 23 #include "chrome/browser/history/in_memory_history_backend.h" | 26 #include "chrome/browser/history/in_memory_history_backend.h" |
| 24 #include "chrome/browser/history/page_usage_data.h" | 27 #include "chrome/browser/history/page_usage_data.h" |
| 25 #include "chrome/browser/history/top_sites.h" | 28 #include "chrome/browser/history/top_sites.h" |
| 26 #include "chrome/common/chrome_constants.h" | 29 #include "chrome/common/chrome_constants.h" |
| 27 #include "chrome/common/chrome_switches.h" | |
| 28 #include "chrome/common/notification_type.h" | 30 #include "chrome/common/notification_type.h" |
| 29 #include "chrome/common/url_constants.h" | 31 #include "chrome/common/url_constants.h" |
| 30 #include "googleurl/src/gurl.h" | 32 #include "googleurl/src/gurl.h" |
| 31 #include "grit/chromium_strings.h" | 33 #include "grit/chromium_strings.h" |
| 32 #include "grit/generated_resources.h" | 34 #include "grit/generated_resources.h" |
| 33 #include "net/base/registry_controlled_domain.h" | 35 #include "net/base/registry_controlled_domain.h" |
| 34 | 36 |
| 35 using base::Time; | 37 using base::Time; |
| 36 using base::TimeDelta; | 38 using base::TimeDelta; |
| 37 using base::TimeTicks; | 39 using base::TimeTicks; |
| (...skipping 2144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2182 return true; | 2184 return true; |
| 2183 } | 2185 } |
| 2184 | 2186 |
| 2185 BookmarkService* HistoryBackend::GetBookmarkService() { | 2187 BookmarkService* HistoryBackend::GetBookmarkService() { |
| 2186 if (bookmark_service_) | 2188 if (bookmark_service_) |
| 2187 bookmark_service_->BlockTillLoaded(); | 2189 bookmark_service_->BlockTillLoaded(); |
| 2188 return bookmark_service_; | 2190 return bookmark_service_; |
| 2189 } | 2191 } |
| 2190 | 2192 |
| 2191 } // namespace history | 2193 } // namespace history |
| OLD | NEW |