diff options
Diffstat (limited to 'chrome/browser/search')
30 files changed, 45 insertions, 12 deletions
diff --git a/chrome/browser/search/contextual_search_policy_handler_android.h b/chrome/browser/search/contextual_search_policy_handler_android.h index 3794c20..edf1aec 100644 --- a/chrome/browser/search/contextual_search_policy_handler_android.h +++ b/chrome/browser/search/contextual_search_policy_handler_android.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_CONTEXTUAL_SEARCH_POLICY_HANDLER_ANDROID_H_ #define CHROME_BROWSER_SEARCH_CONTEXTUAL_SEARCH_POLICY_HANDLER_ANDROID_H_ +#include "base/macros.h" #include "components/policy/core/browser/configuration_policy_handler.h" namespace policy { diff --git a/chrome/browser/search/hotword_audio_history_handler.h b/chrome/browser/search/hotword_audio_history_handler.h index 30dbe1e..957e9df 100644 --- a/chrome/browser/search/hotword_audio_history_handler.h +++ b/chrome/browser/search/hotword_audio_history_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_HOTWORD_AUDIO_HISTORY_HANDLER_H_ #define CHROME_BROWSER_SEARCH_HOTWORD_AUDIO_HISTORY_HANDLER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" diff --git a/chrome/browser/search/hotword_installer_browsertest.cc b/chrome/browser/search/hotword_installer_browsertest.cc index 3293bf2..94a02da 100644 --- a/chrome/browser/search/hotword_installer_browsertest.cc +++ b/chrome/browser/search/hotword_installer_browsertest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/webstore_startup_installer.h" diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc index b2880b54..56adbbb 100644 --- a/chrome/browser/search/hotword_service.cc +++ b/chrome/browser/search/hotword_service.cc @@ -4,11 +4,14 @@ #include "chrome/browser/search/hotword_service.h" +#include <stddef.h> + #include <string> #include "base/command_line.h" #include "base/i18n/case_conversion.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" @@ -17,6 +20,7 @@ #include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h" diff --git a/chrome/browser/search/hotword_service.h b/chrome/browser/search/hotword_service.h index 5a97db6..e8d69dc 100644 --- a/chrome/browser/search/hotword_service.h +++ b/chrome/browser/search/hotword_service.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h" diff --git a/chrome/browser/search/hotword_service_factory.cc b/chrome/browser/search/hotword_service_factory.cc index ddd91b1..5afb1a8 100644 --- a/chrome/browser/search/hotword_service_factory.cc +++ b/chrome/browser/search/hotword_service_factory.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/hotword_service.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/search/hotword_service_factory.h b/chrome/browser/search/hotword_service_factory.h index 31139bd..d20ab93f 100644 --- a/chrome/browser/search/hotword_service_factory.h +++ b/chrome/browser/search/hotword_service_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_HOTWORD_SERVICE_FACTORY_H_ #define CHROME_BROWSER_SEARCH_HOTWORD_SERVICE_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc index c1571fb..3d56feb 100644 --- a/chrome/browser/search/hotword_service_unittest.cc +++ b/chrome/browser/search/hotword_service_unittest.cc @@ -7,6 +7,7 @@ #include "base/metrics/field_trial.h" #include "base/prefs/pref_service.h" #include "base/test/test_simple_task_runner.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service_test_base.h" #include "chrome/browser/extensions/test_extension_service.h" diff --git a/chrome/browser/search/iframe_source.h b/chrome/browser/search/iframe_source.h index 80beefc..3897dfd 100644 --- a/chrome/browser/search/iframe_source.h +++ b/chrome/browser/search/iframe_source.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SEARCH_IFRAME_SOURCE_H_ #define CHROME_BROWSER_SEARCH_IFRAME_SOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/url_data_source.h" // Base class for URL data sources for chrome-search:// iframed content. diff --git a/chrome/browser/search/instant_io_context.h b/chrome/browser/search/instant_io_context.h index 325a395..41b44ac 100644 --- a/chrome/browser/search/instant_io_context.h +++ b/chrome/browser/search/instant_io_context.h @@ -7,7 +7,7 @@ #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" class GURL; diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc index 1c168e9..9a89038 100644 --- a/chrome/browser/search/instant_service.cc +++ b/chrome/browser/search/instant_service.cc @@ -4,9 +4,12 @@ #include "chrome/browser/search/instant_service.h" +#include <stddef.h> + #include "base/metrics/field_trial.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/favicon/fallback_icon_service_factory.h" #include "chrome/browser/favicon/large_icon_service_factory.h" diff --git a/chrome/browser/search/instant_service.h b/chrome/browser/search/instant_service.h index 9221aaf..96abba7 100644 --- a/chrome/browser/search/instant_service.h +++ b/chrome/browser/search/instant_service.h @@ -9,6 +9,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "components/history/core/browser/history_types.h" diff --git a/chrome/browser/search/instant_service_factory.h b/chrome/browser/search/instant_service_factory.h index 747b879..155d2cb 100644 --- a/chrome/browser/search/instant_service_factory.h +++ b/chrome/browser/search/instant_service_factory.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SEARCH_INSTANT_SERVICE_FACTORY_H_ #define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_FACTORY_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" diff --git a/chrome/browser/search/instant_unittest_base.cc b/chrome/browser/search/instant_unittest_base.cc index 3ba7101..fc9dfb6 100644 --- a/chrome/browser/search/instant_unittest_base.cc +++ b/chrome/browser/search/instant_unittest_base.cc @@ -7,6 +7,7 @@ #include <string> #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/instant_service.h" diff --git a/chrome/browser/search/instant_unittest_base.h b/chrome/browser/search/instant_unittest_base.h index 267895a..a427f36 100644 --- a/chrome/browser/search/instant_unittest_base.h +++ b/chrome/browser/search/instant_unittest_base.h @@ -8,6 +8,7 @@ #include <string> #include "base/metrics/field_trial.h" +#include "build/build_config.h" #include "chrome/browser/search/instant_service.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "components/search_engines/template_url_service.h" diff --git a/chrome/browser/search/local_files_ntp_source.cc b/chrome/browser/search/local_files_ntp_source.cc index f3732b7..294a71e 100644 --- a/chrome/browser/search/local_files_ntp_source.cc +++ b/chrome/browser/search/local_files_ntp_source.cc @@ -15,6 +15,7 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h" +#include "build/build_config.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc index aa104f7..48bfaa8 100644 --- a/chrome/browser/search/local_ntp_source.cc +++ b/chrome/browser/search/local_ntp_source.cc @@ -4,9 +4,12 @@ #include "chrome/browser/search/local_ntp_source.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" diff --git a/chrome/browser/search/local_ntp_source.h b/chrome/browser/search/local_ntp_source.h index c4085232..efa3771 100644 --- a/chrome/browser/search/local_ntp_source.h +++ b/chrome/browser/search/local_ntp_source.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SEARCH_LOCAL_NTP_SOURCE_H_ #define CHROME_BROWSER_SEARCH_LOCAL_NTP_SOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/url_data_source.h" class Profile; diff --git a/chrome/browser/search/most_visited_iframe_source.h b/chrome/browser/search/most_visited_iframe_source.h index d38d9b5..9c6ccd0 100644 --- a/chrome/browser/search/most_visited_iframe_source.h +++ b/chrome/browser/search/most_visited_iframe_source.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_SEARCH_MOST_VISITED_IFRAME_SOURCE_H_ #define CHROME_BROWSER_SEARCH_MOST_VISITED_IFRAME_SOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/search/iframe_source.h" // Serves HTML for displaying suggestions using iframes, e.g. diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc index 1a4b64d..45732f8 100644 --- a/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc @@ -4,6 +4,8 @@ #include "chrome/browser/search/search.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/search/search.h b/chrome/browser/search/search.h index 5435641..ff0fb1f 100644 --- a/chrome/browser/search/search.h +++ b/chrome/browser/search/search.h @@ -9,7 +9,6 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/strings/string16.h" #include "chrome/browser/ui/search/search_model.h" diff --git a/chrome/browser/search/search_terms_tracker.h b/chrome/browser/search/search_terms_tracker.h index d22f28b..635ebef 100644 --- a/chrome/browser/search/search_terms_tracker.h +++ b/chrome/browser/search/search_terms_tracker.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/strings/string16.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc index 8807c05..a696260 100644 --- a/chrome/browser/search/search_unittest.cc +++ b/chrome/browser/search/search_unittest.cc @@ -2,12 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_base.h" #include "base/metrics/histogram_samples.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/search/search.h" diff --git a/chrome/browser/search/suggestions/image_fetcher_impl.h b/chrome/browser/search/suggestions/image_fetcher_impl.h index 82379f2..167865a 100644 --- a/chrome/browser/search/suggestions/image_fetcher_impl.h +++ b/chrome/browser/search/suggestions/image_fetcher_impl.h @@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" #include "components/suggestions/image_fetcher.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc b/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc index 034abca..2388f4e 100644 --- a/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc +++ b/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/search/suggestions/suggestions_service_factory.h b/chrome/browser/search/suggestions/suggestions_service_factory.h index 7066d5f..18b4364 100644 --- a/chrome/browser/search/suggestions/suggestions_service_factory.h +++ b/chrome/browser/search/suggestions/suggestions_service_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SEARCH_SUGGESTIONS_SUGGESTIONS_SERVICE_FACTORY_H_ #define CHROME_BROWSER_SEARCH_SUGGESTIONS_SUGGESTIONS_SERVICE_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" diff --git a/chrome/browser/search/suggestions/suggestions_source.cc b/chrome/browser/search/suggestions/suggestions_source.cc index 79ea0be..1442a5a 100644 --- a/chrome/browser/search/suggestions/suggestions_source.cc +++ b/chrome/browser/search/suggestions/suggestions_source.cc @@ -4,6 +4,9 @@ #include "chrome/browser/search/suggestions/suggestions_source.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/barrier_closure.h" @@ -48,8 +51,8 @@ void RenderOutputHtml(const SuggestionsProfile& profile, out.push_back(kHtmlBody); out.push_back("<h1>Suggestions</h1>\n<ul>"); - int64 now = (base::Time::NowFromSystemTime() - base::Time::UnixEpoch()) - .ToInternalValue(); + int64_t now = (base::Time::NowFromSystemTime() - base::Time::UnixEpoch()) + .ToInternalValue(); size_t size = profile.suggestions_size(); for (size_t i = 0; i < size; ++i) { const ChromeSuggestion& suggestion = profile.suggestions(i); diff --git a/chrome/browser/search/suggestions/suggestions_source.h b/chrome/browser/search/suggestions/suggestions_source.h index eb31cb4..b753b28 100644 --- a/chrome/browser/search/suggestions/suggestions_source.h +++ b/chrome/browser/search/suggestions/suggestions_source.h @@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "components/suggestions/proto/suggestions.pb.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/search/thumbnail_source.cc b/chrome/browser/search/thumbnail_source.cc index f0d47c7..b92b102 100644 --- a/chrome/browser/search/thumbnail_source.cc +++ b/chrome/browser/search/thumbnail_source.cc @@ -4,6 +4,8 @@ #include "chrome/browser/search/thumbnail_source.h" +#include <stddef.h> + #include "base/callback.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop/message_loop.h" diff --git a/chrome/browser/search/thumbnail_source.h b/chrome/browser/search/thumbnail_source.h index 35949e9..ef3abd1 100644 --- a/chrome/browser/search/thumbnail_source.h +++ b/chrome/browser/search/thumbnail_source.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/url_data_source.h" |