diff options
57 files changed, 67 insertions, 47 deletions
diff --git a/chrome/browser/accessibility_events.cc b/chrome/browser/accessibility_events.cc index 068a3b4..aade4b3 100644 --- a/chrome/browser/accessibility_events.cc +++ b/chrome/browser/accessibility_events.cc @@ -4,6 +4,8 @@ #include "chrome/browser/accessibility_events.h" +#include "base/values.h" + #include "chrome/browser/extensions/extension_accessibility_api_constants.h" #include "chrome/browser/profile.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/accessibility_events.h b/chrome/browser/accessibility_events.h index 29376cd..a0ef971 100644 --- a/chrome/browser/accessibility_events.h +++ b/chrome/browser/accessibility_events.h @@ -8,9 +8,8 @@ #include <string> -#include "base/values.h" - class AccessibilityControlInfo; +class DictionaryValue; class NotificationType; class Profile; @@ -29,7 +28,7 @@ class AccessibilityControlInfo { // Serialize this class as a DictionaryValue that can be converted to // a JavaScript object. - virtual void SerializeToDict(DictionaryValue *dict) const; + virtual void SerializeToDict(DictionaryValue* dict) const; // Return the specific type of this control, which will be one of the // string constants defined in extension_accessibility_api_constants.h. @@ -98,7 +97,7 @@ class AccessibilityRadioButtonInfo : public AccessibilityControlInfo { virtual const char* type() const; - virtual void SerializeToDict(DictionaryValue *dict) const; + virtual void SerializeToDict(DictionaryValue* dict) const; void SetChecked(bool checked) { checked_ = checked; } @@ -122,7 +121,7 @@ class AccessibilityCheckboxInfo : public AccessibilityControlInfo { virtual const char* type() const; - virtual void SerializeToDict(DictionaryValue *dict) const; + virtual void SerializeToDict(DictionaryValue* dict) const; void SetChecked(bool checked) { checked_ = checked; } @@ -145,7 +144,7 @@ class AccessibilityTabInfo : public AccessibilityControlInfo { virtual const char* type() const; - virtual void SerializeToDict(DictionaryValue *dict) const; + virtual void SerializeToDict(DictionaryValue* dict) const; void SetTab(int tab_index, std::string tab_name) { tab_index_ = tab_index; @@ -175,7 +174,7 @@ class AccessibilityComboBoxInfo : public AccessibilityControlInfo { virtual const char* type() const; - virtual void SerializeToDict(DictionaryValue *dict) const; + virtual void SerializeToDict(DictionaryValue* dict) const; void SetValue(int item_index, std::string value) { item_index_ = item_index; @@ -207,7 +206,7 @@ class AccessibilityTextBoxInfo : public AccessibilityControlInfo { virtual const char* type() const; - virtual void SerializeToDict(DictionaryValue *dict) const; + virtual void SerializeToDict(DictionaryValue* dict) const; void SetValue(std::string value, int selection_start, int selection_end) { value_ = value; @@ -239,7 +238,7 @@ class AccessibilityListBoxInfo : public AccessibilityControlInfo { virtual const char* type() const; - virtual void SerializeToDict(DictionaryValue *dict) const; + virtual void SerializeToDict(DictionaryValue* dict) const; void SetValue(int item_index, std::string value) { item_index_ = item_index; @@ -282,7 +281,7 @@ class AccessibilityMenuItemInfo : public AccessibilityControlInfo { virtual const char* type() const; - virtual void SerializeToDict(DictionaryValue *dict) const; + virtual void SerializeToDict(DictionaryValue* dict) const; private: bool has_submenu_; diff --git a/chrome/browser/automation/automation_extension_function.cc b/chrome/browser/automation/automation_extension_function.cc index c58e45cd..ce556be 100644 --- a/chrome/browser/automation/automation_extension_function.cc +++ b/chrome/browser/automation/automation_extension_function.cc @@ -8,6 +8,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/values.h" #include "chrome/browser/automation/extension_automation_constants.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/browser_theme_provider_unittest.cc b/chrome/browser/browser_theme_provider_unittest.cc index 533c7af..e5f7235 100644 --- a/chrome/browser/browser_theme_provider_unittest.cc +++ b/chrome/browser/browser_theme_provider_unittest.cc @@ -5,7 +5,6 @@ #include "chrome/browser/browser_theme_provider.h" #include "testing/gtest/include/gtest/gtest.h" -#include "base/values.h" #include "base/json/json_reader.h" TEST(BrowserThemeProviderTest, AlignmentConversion) { diff --git a/chrome/browser/chromeos/cros_settings.cc b/chrome/browser/chromeos/cros_settings.cc index 8628246..d299c4f 100644 --- a/chrome/browser/chromeos/cros_settings.cc +++ b/chrome/browser/chromeos/cros_settings.cc @@ -6,6 +6,7 @@ #include "base/singleton.h" #include "base/string_util.h" +#include "base/values.h" #include "chrome/browser/chromeos/cros_settings_provider.h" #include "chrome/browser/chromeos/cros_settings_provider_user.h" diff --git a/chrome/browser/chromeos/cros_settings.h b/chrome/browser/chromeos/cros_settings.h index e356b37..1b20ad3 100644 --- a/chrome/browser/chromeos/cros_settings.h +++ b/chrome/browser/chromeos/cros_settings.h @@ -9,10 +9,11 @@ #include <string> #include <vector> #include "base/singleton.h" -#include "base/values.h" #include "chrome/browser/chromeos/cros_settings_names.h" +class Value; + namespace chromeos { class CrosSettingsProvider; diff --git a/chrome/browser/chromeos/cros_settings_provider.h b/chrome/browser/chromeos/cros_settings_provider.h index 8ca7dc1..e4184ed7 100644 --- a/chrome/browser/chromeos/cros_settings_provider.h +++ b/chrome/browser/chromeos/cros_settings_provider.h @@ -6,7 +6,8 @@ #define CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_H_ #include <string> -#include "base/values.h" + +class Value; namespace chromeos { diff --git a/chrome/browser/chromeos/cros_settings_provider_user.cc b/chrome/browser/chromeos/cros_settings_provider_user.cc index 8305e13..900427a 100644 --- a/chrome/browser/chromeos/cros_settings_provider_user.cc +++ b/chrome/browser/chromeos/cros_settings_provider_user.cc @@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/cros_settings_provider_user.h" #include "base/string_util.h" +#include "base/values.h" #include "chrome/browser/chromeos/cros_settings_names.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros_settings_provider_user.h b/chrome/browser/chromeos/cros_settings_provider_user.h index 9842383..de31493 100644 --- a/chrome/browser/chromeos/cros_settings_provider_user.h +++ b/chrome/browser/chromeos/cros_settings_provider_user.h @@ -10,6 +10,8 @@ #include "base/scoped_ptr.h" #include "chrome/browser/chromeos/cros_settings_provider.h" +class DictionaryValue; + namespace chromeos { class UserCrosSettingsProvider : public CrosSettingsProvider { diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index 89e57e0..64be489 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/time.h" -#include "base/values.h" #include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" diff --git a/chrome/browser/cocoa/page_info_window_controller.mm b/chrome/browser/cocoa/page_info_window_controller.mm index 521ab68..fc98b02 100644 --- a/chrome/browser/cocoa/page_info_window_controller.mm +++ b/chrome/browser/cocoa/page_info_window_controller.mm @@ -6,7 +6,6 @@ #include "app/l10n_util_mac.h" #include "base/mac_util.h" -#include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/cocoa/page_info_window_mac.h" #include "chrome/browser/cocoa/window_size_autosaver.h" diff --git a/chrome/browser/configuration_policy_provider.h b/chrome/browser/configuration_policy_provider.h index b7eea31..3bbbf22 100644 --- a/chrome/browser/configuration_policy_provider.h +++ b/chrome/browser/configuration_policy_provider.h @@ -9,6 +9,7 @@ #include <vector> #include "base/basictypes.h" +#include "base/values.h" #include "chrome/browser/configuration_policy_store.h" // A mostly-abstract super class for platform-specific policy providers. @@ -51,4 +52,3 @@ class ConfigurationPolicyProvider { }; #endif // CHROME_BROWSER_CONFIGURATION_POLICY_PROVIDER_H_ - diff --git a/chrome/browser/configuration_policy_store.h b/chrome/browser/configuration_policy_store.h index a1e5ccb..50c6f17 100644 --- a/chrome/browser/configuration_policy_store.h +++ b/chrome/browser/configuration_policy_store.h @@ -6,7 +6,9 @@ #define CHROME_BROWSER_CONFIGURATION_POLICY_STORE_H_ #pragma once -#include "base/values.h" +#include "base/basictypes.h" + +class Value; // An abstract super class for policy stores that provides a method that can be // called by a |ConfigurationPolicyProvider| to specify a policy. diff --git a/chrome/browser/dom_ui/file_browse_browsertest.cc b/chrome/browser/dom_ui/file_browse_browsertest.cc index eedd4eb..a514536 100644 --- a/chrome/browser/dom_ui/file_browse_browsertest.cc +++ b/chrome/browser/dom_ui/file_browse_browsertest.cc @@ -2,10 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" -#include "base/file_util.h" #include "base/task.h" -#include "base/values.h" #include "base/path_service.h" #include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/browser/tab_contents/navigation_controller.h" diff --git a/chrome/browser/dom_ui/slideshow_ui.h b/chrome/browser/dom_ui/slideshow_ui.h index 0cd63c0..8bcb25a3 100644 --- a/chrome/browser/dom_ui/slideshow_ui.h +++ b/chrome/browser/dom_ui/slideshow_ui.h @@ -8,9 +8,7 @@ #include <vector> -#include "base/file_path.h" #include "base/scoped_ptr.h" -#include "base/values.h" #include "chrome/browser/dom_ui/dom_ui.h" class SlideshowUI : public DOMUI { diff --git a/chrome/browser/dummy_pref_store.cc b/chrome/browser/dummy_pref_store.cc index 7b3cd0a..27dda06 100644 --- a/chrome/browser/dummy_pref_store.cc +++ b/chrome/browser/dummy_pref_store.cc @@ -4,6 +4,8 @@ #include "chrome/browser/dummy_pref_store.h" +#include "base/values.h" + DummyPrefStore::DummyPrefStore() : prefs_(new DictionaryValue()), read_only_(true), @@ -18,4 +20,3 @@ bool DummyPrefStore::WritePrefs() { prefs_written_ = true; return prefs_written_; } - diff --git a/chrome/browser/dummy_pref_store.h b/chrome/browser/dummy_pref_store.h index fb39819..6a99226 100644 --- a/chrome/browser/dummy_pref_store.h +++ b/chrome/browser/dummy_pref_store.h @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "base/values.h" #include "chrome/common/pref_store.h" +class DictionaryValue; // |DummyPrefStore| is a stub implementation of the |PrefStore| interface. // It allows to get and set the state of the |PrefStore|. diff --git a/chrome/browser/extensions/extension_accessibility_api.h b/chrome/browser/extensions/extension_accessibility_api.h index 6c79d7d..b837e06 100644 --- a/chrome/browser/extensions/extension_accessibility_api.h +++ b/chrome/browser/extensions/extension_accessibility_api.h @@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/singleton.h" +#include "base/values.h" #include "chrome/browser/accessibility_events.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/extensions/extension_browser_actions_api.h b/chrome/browser/extensions/extension_browser_actions_api.h index 6dd3d20..c6b2e24 100644 --- a/chrome/browser/extensions/extension_browser_actions_api.h +++ b/chrome/browser/extensions/extension_browser_actions_api.h @@ -9,6 +9,7 @@ #include "chrome/browser/extensions/extension_function.h" #include "chrome/common/extensions/extension_action.h" +class DictionaryValue; class ExtensionAction; // Base class for chrome.browserAction.* APIs. diff --git a/chrome/browser/extensions/extension_context_menu_api.h b/chrome/browser/extensions/extension_context_menu_api.h index 77aac9d..4c246c2 100644 --- a/chrome/browser/extensions/extension_context_menu_api.h +++ b/chrome/browser/extensions/extension_context_menu_api.h @@ -10,6 +10,7 @@ #include "chrome/browser/extensions/extension_menu_manager.h" #include "chrome/common/extensions/extension_extent.h" +class DictionaryValue; class ExtensionMenuItem; class ExtensionContextMenuFunction : public SyncExtensionFunction { diff --git a/chrome/browser/extensions/extension_cookies_api.h b/chrome/browser/extensions/extension_cookies_api.h index 067cb6f..666fe7a 100644 --- a/chrome/browser/extensions/extension_cookies_api.h +++ b/chrome/browser/extensions/extension_cookies_api.h @@ -20,6 +20,7 @@ #include "googleurl/src/gurl.h" #include "net/base/cookie_monster.h" +class DictionaryValue; class URLRequestContextGetter; // Observes CookieMonster notifications and routes them as events to the diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h index 9bb4be5..44fde69 100644 --- a/chrome/browser/extensions/extension_function.h +++ b/chrome/browser/extensions/extension_function.h @@ -9,14 +9,15 @@ #include <string> #include <list> -#include "base/values.h" #include "base/scoped_ptr.h" #include "base/ref_counted.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" class ExtensionFunctionDispatcher; +class ListValue; class Profile; class QuotaLimitHeuristic; +class Value; #define EXTENSION_FUNCTION_VALIDATE(test) do { \ if (!(test)) { \ diff --git a/chrome/browser/extensions/extension_processes_api.cc b/chrome/browser/extensions/extension_processes_api.cc index c4895d3..1c6c8dc 100644 --- a/chrome/browser/extensions/extension_processes_api.cc +++ b/chrome/browser/extensions/extension_processes_api.cc @@ -4,6 +4,8 @@ #include "chrome/browser/extensions/extension_processes_api.h" +#include "base/values.h" + #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extension_processes_api_constants.h" #include "chrome/browser/renderer_host/render_process_host.h" diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h index a857364..4290f2e 100644 --- a/chrome/browser/extensions/extensions_service.h +++ b/chrome/browser/extensions/extensions_service.h @@ -19,7 +19,6 @@ #include "base/task.h" #include "base/time.h" #include "base/tuple.h" -#include "base/values.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/extensions/extension_icon_manager.h" #include "chrome/browser/extensions/extension_menu_manager.h" diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.h b/chrome/browser/extensions/sandboxed_extension_unpacker.h index a9b6408..00ee232 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.h +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.h @@ -11,9 +11,9 @@ #include "base/file_path.h" #include "base/ref_counted.h" #include "base/scoped_temp_dir.h" -#include "base/values.h" #include "chrome/browser/utility_process_host.h" +class DictionaryValue; class Extension; class ResourceDispatcherHost; diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc index 748cd46..92e897e 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc @@ -8,7 +8,6 @@ #include "base/ref_counted.h" #include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "base/values.h" #include "chrome/browser/extensions/sandboxed_extension_unpacker.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/first_run/first_run_gtk.cc b/chrome/browser/first_run/first_run_gtk.cc index 7679b4f..cd32cec 100644 --- a/chrome/browser/first_run/first_run_gtk.cc +++ b/chrome/browser/first_run/first_run_gtk.cc @@ -10,6 +10,7 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_util.h" +#include "base/values.h" #include "chrome/browser/gtk/first_run_dialog.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/shell_integration.h" diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc index 2b95cc3..4bac89a 100644 --- a/chrome/browser/importer/firefox3_importer.cc +++ b/chrome/browser/importer/firefox3_importer.cc @@ -11,6 +11,7 @@ #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/string_util.h" +#include "base/values.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/firefox2_importer.h" #include "chrome/browser/importer/firefox_importer_utils.h" diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index 2824b40..21b36d1 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -23,6 +23,7 @@ #include "base/scoped_comptr_win.h" #include "base/string_util.h" #include "base/time.h" +#include "base/values.h" #include "base/win_util.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/importer/importer_bridge.h" diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc index 85095ee..930d57d 100644 --- a/chrome/browser/importer/importer_unittest.cc +++ b/chrome/browser/importer/importer_unittest.cc @@ -23,6 +23,7 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "base/values.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/importer.h" diff --git a/chrome/browser/importer/mork_reader.cc b/chrome/browser/importer/mork_reader.cc index 9115c8d..4207ad6 100644 --- a/chrome/browser/importer/mork_reader.cc +++ b/chrome/browser/importer/mork_reader.cc @@ -50,6 +50,7 @@ #include "base/message_loop.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/values.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/firefox_importer_utils.h" #include "chrome/browser/importer/importer.h" diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm index 9a30073..43e7c28 100644 --- a/chrome/browser/importer/safari_importer.mm +++ b/chrome/browser/importer/safari_importer.mm @@ -15,6 +15,7 @@ #include "base/string16.h" #include "base/sys_string_conversions.h" #include "base/time.h" +#include "base/values.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/importer_bridge.h" #include "chrome/browser/importer/importer_data_types.h" diff --git a/chrome/browser/importer/safari_importer_unittest.mm b/chrome/browser/importer/safari_importer_unittest.mm index 081c26e..36f233a 100644 --- a/chrome/browser/importer/safari_importer_unittest.mm +++ b/chrome/browser/importer/safari_importer_unittest.mm @@ -10,6 +10,7 @@ #include "base/path_service.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" +#include "base/values.h" #include "chrome/browser/history/history_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/file_test_utils.h" diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index 49ce2b6..05bd16d6 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -10,6 +10,7 @@ #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" +#include "base/values.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/importer/importer_bridge.h" diff --git a/chrome/browser/metrics/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc index fcadfa2a..d705508 100644 --- a/chrome/browser/metrics/metrics_service_uitest.cc +++ b/chrome/browser/metrics/metrics_service_uitest.cc @@ -11,7 +11,6 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/platform_thread.h" -#include "base/values.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/pref_value_store.h" diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc index 5c1b518..83c6160 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.cc @@ -13,6 +13,7 @@ #include "base/stats_counters.h" #include "base/string_util.h" #include "base/time.h" +#include "base/values.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/net/preconnect.h" #include "net/base/address_list.h" @@ -580,4 +581,9 @@ GURL Predictor::HostNameQueue::Pop() { return url; } +void Predictor::DeserializeReferrersThenDelete(ListValue* referral_list) { + DeserializeReferrers(*referral_list); + delete referral_list; +} + } // namespace chrome_browser_net diff --git a/chrome/browser/net/predictor.h b/chrome/browser/net/predictor.h index c613093..5d35f74 100644 --- a/chrome/browser/net/predictor.h +++ b/chrome/browser/net/predictor.h @@ -33,6 +33,8 @@ #include "chrome/common/net/predictor_common.h" #include "net/base/host_port_pair.h" +class ListValue; + namespace net { class HostResolver; } // namespace net @@ -117,10 +119,7 @@ class Predictor : public base::RefCountedThreadSafe<Predictor> { // values into the current referrer list. void DeserializeReferrers(const ListValue& referral_list); - void DeserializeReferrersThenDelete(ListValue* referral_list) { - DeserializeReferrers(*referral_list); - delete referral_list; - } + void DeserializeReferrersThenDelete(ListValue* referral_list); // For unit test code only. size_t max_concurrent_dns_lookups() const { diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index 58c71ed..5bc650a 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -12,6 +12,7 @@ #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/timer.h" +#include "base/values.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/net/predictor_api.h" #include "chrome/browser/net/url_info.h" diff --git a/chrome/browser/net/referrer.cc b/chrome/browser/net/referrer.cc index b5d8c82..0b884d6 100644 --- a/chrome/browser/net/referrer.cc +++ b/chrome/browser/net/referrer.cc @@ -7,6 +7,7 @@ #include <limits.h> #include "base/logging.h" +#include "base/values.h" #include "chrome/browser/net/predictor.h" namespace chrome_browser_net { diff --git a/chrome/browser/net/referrer.h b/chrome/browser/net/referrer.h index 2e43f89..23caaf5 100644 --- a/chrome/browser/net/referrer.h +++ b/chrome/browser/net/referrer.h @@ -21,10 +21,11 @@ #include "base/basictypes.h" #include "base/time.h" -#include "base/values.h" #include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" +class Value; + namespace chrome_browser_net { //------------------------------------------------------------------------------ diff --git a/chrome/browser/password_manager/encryptor.h b/chrome/browser/password_manager/encryptor.h index b17725a..f063be7 100644 --- a/chrome/browser/password_manager/encryptor.h +++ b/chrome/browser/password_manager/encryptor.h @@ -8,7 +8,6 @@ #include <string> -#include "base/values.h" #include "base/string16.h" // The Encryptor class gives access to simple encryption and decryption of diff --git a/chrome/browser/pref_service.cc b/chrome/browser/pref_service.cc index 24a3f96..826b424 100644 --- a/chrome/browser/pref_service.cc +++ b/chrome/browser/pref_service.cc @@ -9,6 +9,7 @@ #include "app/l10n_util.h" #include "base/command_line.h" +#include "base/file_path.h" #include "base/histogram.h" #include "base/logging.h" #include "base/message_loop.h" diff --git a/chrome/browser/pref_value_store.cc b/chrome/browser/pref_value_store.cc index 73e9668..ab72336c 100644 --- a/chrome/browser/pref_value_store.cc +++ b/chrome/browser/pref_value_store.cc @@ -4,6 +4,7 @@ #include "chrome/browser/pref_value_store.h" +#include "base/values.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/command_line_pref_store.h" #include "chrome/browser/configuration_policy_pref_store.h" diff --git a/chrome/browser/profile_import_process_host.h b/chrome/browser/profile_import_process_host.h index 9b11a42..72754c6 100644 --- a/chrome/browser/profile_import_process_host.h +++ b/chrome/browser/profile_import_process_host.h @@ -11,7 +11,6 @@ #include "base/basictypes.h" #include "base/ref_counted.h" -#include "base/values.h" #include "chrome/browser/browser_child_process_host.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/scoped_pref_update.cc b/chrome/browser/scoped_pref_update.cc index 36d2306..6a18bf6 100644 --- a/chrome/browser/scoped_pref_update.cc +++ b/chrome/browser/scoped_pref_update.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/values.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/scoped_pref_update.h" diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc index 9c75994..712955c 100644 --- a/chrome/browser/views/options/advanced_page_view.cc +++ b/chrome/browser/views/options/advanced_page_view.cc @@ -7,7 +7,6 @@ #include "app/l10n_util.h" #include "app/message_box_flags.h" #include "base/string_util.h" -#include "base/values.h" #include "chrome/browser/options_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/options/advanced_contents_view.h" diff --git a/chrome/common/extensions/update_manifest.cc b/chrome/common/extensions/update_manifest.cc index ec8b444..57d394c 100644 --- a/chrome/common/extensions/update_manifest.cc +++ b/chrome/common/extensions/update_manifest.cc @@ -9,7 +9,6 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/string_number_conversions.h" -#include "base/values.h" #include "base/version.h" #include "chrome/common/libxml_utils.h" #include "libxml/tree.h" diff --git a/chrome/common/render_messages_unittest.cc b/chrome/common/render_messages_unittest.cc index 5d590c3..ccfc898 100644 --- a/chrome/common/render_messages_unittest.cc +++ b/chrome/common/render_messages_unittest.cc @@ -5,7 +5,6 @@ #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/utf_string_conversions.h" -#include "base/values.h" #include "chrome/common/render_messages.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/setup/install.h b/chrome/installer/setup/install.h index f76774aa..a3c050f 100644 --- a/chrome/installer/setup/install.h +++ b/chrome/installer/setup/install.h @@ -8,11 +8,13 @@ #define CHROME_INSTALLER_SETUP_INSTALL_H_ #pragma once -#include <base/values.h> +#include <string> #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/version.h" +class DictionaryValue; + namespace installer { // Get path to the installer under Chrome version folder // (for example <path>\Google\Chrome\<Version>\installer) diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc index 1940d0d..a64a7cc 100644 --- a/chrome/installer/util/install_util.cc +++ b/chrome/installer/util/install_util.cc @@ -19,6 +19,7 @@ #include "base/registry.h" #include "base/scoped_ptr.h" #include "base/string_util.h" +#include "base/values.h" #include "base/win_util.h" #include "chrome/common/json_value_serializer.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/master_preferences_dummy.cc b/chrome/installer/util/master_preferences_dummy.cc index 3e1fb81..4413187 100644 --- a/chrome/installer/util/master_preferences_dummy.cc +++ b/chrome/installer/util/master_preferences_dummy.cc @@ -13,6 +13,7 @@ #include <windows.h> #include "base/logging.h" +#include "base/values.h" #include "googleurl/src/gurl.h" namespace installer_util { diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 56685ad..7d170d0 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -22,6 +22,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "base/values.h" #include "base/win_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/service/cloud_print/job_status_updater.cc b/chrome/service/cloud_print/job_status_updater.cc index 808b209..8ef52de 100644 --- a/chrome/service/cloud_print/job_status_updater.cc +++ b/chrome/service/cloud_print/job_status_updater.cc @@ -7,7 +7,6 @@ #include "base/json/json_reader.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "base/values.h" #include "chrome/service/cloud_print/cloud_print_consts.h" #include "chrome/service/cloud_print/cloud_print_helpers.h" #include "googleurl/src/gurl.h" @@ -91,4 +90,3 @@ void JobStatusUpdater::OnURLFetchComplete(const URLFetcher* source, FROM_HERE, NewRunnableMethod(this, &JobStatusUpdater::Stop)); } } - diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc index c1085e4..404e8df 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -23,6 +23,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/task.h" +#include "base/values.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index d3604aa..7b65d30 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -13,7 +13,6 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "base/values.h" #include "chrome/common/content_settings.h" #include "chrome/common/navigation_types.h" #include "chrome/test/automation/autocomplete_edit_proxy.h" diff --git a/chrome/utility/utility_thread.cc b/chrome/utility/utility_thread.cc index eccda40..420df28 100644 --- a/chrome/utility/utility_thread.cc +++ b/chrome/utility/utility_thread.cc @@ -11,7 +11,6 @@ #include "base/iat_patch.h" #endif #include "base/path_service.h" -#include "base/values.h" #include "chrome/common/child_process.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_unpacker.h" @@ -254,4 +253,3 @@ bool UtilityThread::RenderPDFToWinMetafile( return ret; } #endif // defined(OS_WIN) - diff --git a/chrome_frame/np_proxy_service.h b/chrome_frame/np_proxy_service.h index 0788b92..d325527 100644 --- a/chrome_frame/np_proxy_service.h +++ b/chrome_frame/np_proxy_service.h @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "base/values.h" #include "base/scoped_ptr.h" // Avoid conflicts with basictypes and the gecko sdk. @@ -29,6 +28,7 @@ ASSOCIATE_IID(NS_ISERVICEMANAGER_IID_STR, nsIServiceManager); ASSOCIATE_IID(NS_IPREFSERVICE_IID_STR, nsIPrefService); ASSOCIATE_IID(NS_IPREFBRANCH2_IID_STR, nsIPrefBranch2); +class DictionaryValue; class nsIServiceManager; class nsIPrefService; class nsIPrefBranch2; |