diff options
36 files changed, 64 insertions, 22 deletions
diff --git a/base/clipboard.cc b/base/clipboard.cc index e41fd93..57697c5 100644 --- a/base/clipboard.cc +++ b/base/clipboard.cc @@ -4,6 +4,7 @@ #include "base/clipboard.h" +#include "base/gfx/size.h" #include "base/logging.h" namespace { diff --git a/base/clipboard.h b/base/clipboard.h index 98f3b31..a404418 100644 --- a/base/clipboard.h +++ b/base/clipboard.h @@ -9,10 +9,14 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/process.h" #include "base/string16.h" -#include "base/gfx/size.h" + +namespace gfx { +class Size; +} + +class FilePath; class Clipboard { public: diff --git a/base/clipboard_linux.cc b/base/clipboard_linux.cc index d5195b4..10c0deb 100644 --- a/base/clipboard_linux.cc +++ b/base/clipboard_linux.cc @@ -10,6 +10,8 @@ #include <string> #include <utility> +#include "base/file_path.h" +#include "base/gfx/size.h" #include "base/scoped_ptr.h" #include "base/linux_util.h" #include "base/string_util.h" diff --git a/base/clipboard_mac.mm b/base/clipboard_mac.mm index 8363ffb..889655f 100644 --- a/base/clipboard_mac.mm +++ b/base/clipboard_mac.mm @@ -6,6 +6,7 @@ #import <Cocoa/Cocoa.h> +#include "base/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" diff --git a/base/clipboard_unittest.cc b/base/clipboard_unittest.cc index 4880042..808c5e6 100644 --- a/base/clipboard_unittest.cc +++ b/base/clipboard_unittest.cc @@ -6,6 +6,7 @@ #include "base/basictypes.h" #include "base/clipboard.h" +#include "base/gfx/size.h" #include "base/message_loop.h" #include "base/scoped_clipboard_writer.h" #include "base/string_util.h" diff --git a/base/clipboard_win.cc b/base/clipboard_win.cc index 5ce479f..684bec6 100644 --- a/base/clipboard_win.cc +++ b/base/clipboard_win.cc @@ -11,6 +11,8 @@ #include <shellapi.h> #include "base/clipboard_util.h" +#include "base/file_path.h" +#include "base/gfx/size.h" #include "base/lock.h" #include "base/logging.h" #include "base/message_loop.h" diff --git a/base/condition_variable.h b/base/condition_variable.h index 28f9352..430f57c 100644 --- a/base/condition_variable.h +++ b/base/condition_variable.h @@ -65,6 +65,15 @@ #ifndef BASE_CONDITION_VARIABLE_H_ #define BASE_CONDITION_VARIABLE_H_ +#include "build/build_config.h" + +#if defined(OS_WIN) +#include <windows.h> +#elif defined(OS_POSIX) +#include <pthread.h> +#endif + +#include "base/basictypes.h" #include "base/lock.h" namespace base { diff --git a/base/condition_variable_unittest.cc b/base/condition_variable_unittest.cc index 8e00394..c49a8cb 100644 --- a/base/condition_variable_unittest.cc +++ b/base/condition_variable_unittest.cc @@ -9,6 +9,7 @@ #include <vector> #include "base/condition_variable.h" +#include "base/lock.h" #include "base/logging.h" #include "base/platform_thread.h" #include "base/scoped_ptr.h" diff --git a/base/debug_util.h b/base/debug_util.h index 3ca199c..de4a208 100644 --- a/base/debug_util.h +++ b/base/debug_util.h @@ -9,7 +9,7 @@ #ifndef BASE_DEBUG_UTIL_H_ #define BASE_DEBUG_UTIL_H_ -#include <iostream> +#include <iosfwd> #include <vector> #include "base/basictypes.h" diff --git a/base/debug_util_win.cc b/base/debug_util_win.cc index 5201283..dd67c17 100644 --- a/base/debug_util_win.cc +++ b/base/debug_util_win.cc @@ -7,6 +7,8 @@ #include <windows.h> #include <dbghelp.h> +#include <iostream> + #include "base/basictypes.h" #include "base/lock.h" #include "base/logging.h" @@ -130,7 +132,7 @@ class SymbolContext { // Returns the process this was initialized for. This should only be // called if Init() has been called. We LOG(ERROR) in this situation. - // LOG(FATAL) is not used because this code is might be triggered + // LOG(FATAL) is not used because this code is might be triggered // by a LOG(FATAL) itself. HANDLE process() { if (!initialized_) { @@ -146,7 +148,7 @@ class SymbolContext { // to the ostream os. The format for each line of the backtrace is: // // <tab>SymbolName[0xAddress+Offset] (FileName:LineNo) - // + // // This function should only be called if Init() has been called. We do not // LOG(FATAL) here because this code is called might be triggered by a // LOG(FATAL) itself. diff --git a/base/field_trial.h b/base/field_trial.h index 83cbcf6..39a5bc7 100644 --- a/base/field_trial.h +++ b/base/field_trial.h @@ -66,7 +66,6 @@ #include <string> #include "base/lock.h" -#include "base/non_thread_safe.h" #include "base/ref_counted.h" #include "base/time.h" diff --git a/base/file_version_info.cc b/base/file_version_info.cc index 95fa7c6..4f7f23d 100644 --- a/base/file_version_info.cc +++ b/base/file_version_info.cc @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <windows.h> - #include "base/file_version_info.h" +#include <windows.h> + +#include "base/file_path.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/base/file_version_info.h b/base/file_version_info.h index f38d23f..7e86639 100644 --- a/base/file_version_info.h +++ b/base/file_version_info.h @@ -8,7 +8,6 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/scoped_ptr.h" #if defined(OS_WIN) @@ -22,6 +21,8 @@ class NSBundle; #endif #endif +class FilePath; + // Provides a way to access the version information for a file. // This is the information you access when you select a file in the Windows // explorer, right-click select Properties, then click the Version tab. diff --git a/base/file_version_info_mac.mm b/base/file_version_info_mac.mm index 7090003..ae6603f 100644 --- a/base/file_version_info_mac.mm +++ b/base/file_version_info_mac.mm @@ -6,6 +6,7 @@ #import <Cocoa/Cocoa.h> +#include "base/file_path.h" #include "base/logging.h" #include "base/string_util.h" diff --git a/base/idle_timer.h b/base/idle_timer.h index 355c217..1f6c08c 100644 --- a/base/idle_timer.h +++ b/base/idle_timer.h @@ -33,7 +33,6 @@ #endif #include "base/basictypes.h" -#include "base/task.h" #include "base/timer.h" namespace base { diff --git a/base/message_loop.h b/base/message_loop.h index 0b89e28..01f8c92 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -5,10 +5,8 @@ #ifndef BASE_MESSAGE_LOOP_H_ #define BASE_MESSAGE_LOOP_H_ -#include <deque> #include <queue> #include <string> -#include <vector> #include "base/histogram.h" #include "base/message_pump.h" @@ -16,7 +14,6 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "base/timer.h" #if defined(OS_WIN) // We need this to declare base::MessagePumpWin::Dispatcher, which we should diff --git a/base/perftimer.h b/base/perftimer.h index 6274fee..1ac1a7d 100644 --- a/base/perftimer.h +++ b/base/perftimer.h @@ -6,10 +6,12 @@ #define BASE_PERFTIMER_H_ #include <string> + #include "base/basictypes.h" -#include "base/file_path.h" #include "base/time.h" +class FilePath; + // ---------------------------------------------------------------------- // Initializes and finalizes the perf log. These functions should be // called at the beginning and end (respectively) of running all the diff --git a/base/scoped_clipboard_writer.cc b/base/scoped_clipboard_writer.cc index 9c74e6b..f413061 100644 --- a/base/scoped_clipboard_writer.cc +++ b/base/scoped_clipboard_writer.cc @@ -8,6 +8,7 @@ // base/clipboard.h. #include "base/scoped_clipboard_writer.h" +#include "base/gfx/size.h" #include "base/string_util.h" ScopedClipboardWriter::ScopedClipboardWriter(Clipboard* clipboard) diff --git a/base/system_monitor.h b/base/system_monitor.h index 9fcac9c..7eee09d 100644 --- a/base/system_monitor.h +++ b/base/system_monitor.h @@ -5,8 +5,7 @@ #ifndef BASE_SYSTEM_MONITOR_H_ #define BASE_SYSTEM_MONITOR_H_ -#include "base/observer_list_threadsafe.h" -#include "base/singleton.h" +#include "build/build_config.h" // Windows HiRes timers drain the battery faster so we need to know the battery // status. This isn't true for other platforms. @@ -16,6 +15,12 @@ #undef ENABLE_BATTERY_MONITORING #endif // !OS_WIN +#include "base/observer_list_threadsafe.h" +#include "base/singleton.h" +#if defined(ENABLE_BATTERY_MONITORING) +#include "base/timer.h" +#endif // defined(ENABLE_BATTERY_MONITORING) + namespace base { // Class for monitoring various system-related subsystems diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc index f95f9b8..a97f014 100644 --- a/base/tracked_objects.cc +++ b/base/tracked_objects.cc @@ -6,6 +6,7 @@ #include <math.h> +#include "base/message_loop.h" #include "base/string_util.h" using base::TimeDelta; diff --git a/base/tracked_objects.h b/base/tracked_objects.h index 064de3c..f355b8d 100644 --- a/base/tracked_objects.h +++ b/base/tracked_objects.h @@ -5,16 +5,16 @@ #ifndef BASE_TRACKED_OBJECTS_H_ #define BASE_TRACKED_OBJECTS_H_ -//------------------------------------------------------------------------------ #include <map> #include <string> #include <vector> #include "base/lock.h" -#include "base/message_loop.h" +#include "base/task.h" #include "base/thread_local_storage.h" #include "base/tracked.h" +class MessageLoop; namespace tracked_objects { diff --git a/base/tracked_objects_unittest.cc b/base/tracked_objects_unittest.cc index c9674f5..ab615da 100644 --- a/base/tracked_objects_unittest.cc +++ b/base/tracked_objects_unittest.cc @@ -5,6 +5,8 @@ // Test of classes in the tracked_objects.h classes. #include "base/tracked_objects.h" + +#include "base/message_loop.h" #include "testing/gtest/include/gtest/gtest.h" namespace tracked_objects { diff --git a/base/waitable_event.h b/base/waitable_event.h index d3b4952..31aa085 100644 --- a/base/waitable_event.h +++ b/base/waitable_event.h @@ -14,13 +14,10 @@ #if defined(OS_POSIX) #include <list> #include <utility> -#include "base/condition_variable.h" #include "base/lock.h" #include "base/ref_counted.h" #endif -#include "base/message_loop.h" - namespace base { // This replaces INFINITE from Win32 diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h index 97b731d..b581ca2 100644 --- a/chrome/browser/download/download_manager.h +++ b/chrome/browser/download/download_manager.h @@ -48,6 +48,7 @@ #include "base/observer_list.h" #include "base/ref_counted.h" #include "base/time.h" +#include "base/timer.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/download_types.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/net/url_fetcher_unittest.cc b/chrome/browser/net/url_fetcher_unittest.cc index bb44813..55d6875 100644 --- a/chrome/browser/net/url_fetcher_unittest.cc +++ b/chrome/browser/net/url_fetcher_unittest.cc @@ -4,6 +4,7 @@ #include "base/thread.h" #include "base/time.h" +#include "base/timer.h" #include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/net/url_fetcher_protect.h" #include "chrome/common/chrome_plugin_lib.h" diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index 17c4290..1e35ef5 100644 --- a/chrome/browser/printing/print_job.cc +++ b/chrome/browser/printing/print_job.cc @@ -5,6 +5,7 @@ #include "chrome/browser/printing/print_job.h" #include "base/message_loop.h" +#include "base/timer.h" #include "chrome/browser/printing/print_job_worker.h" #include "chrome/browser/printing/printed_document.h" #include "chrome/browser/printing/printed_page.h" diff --git a/chrome/browser/renderer_host/audio_renderer_host.h b/chrome/browser/renderer_host/audio_renderer_host.h index c7dd0a2..14ed6d2 100644 --- a/chrome/browser/renderer_host/audio_renderer_host.h +++ b/chrome/browser/renderer_host/audio_renderer_host.h @@ -36,6 +36,7 @@ #include <map> #include <deque> +#include "base/lock.h" #include "base/process.h" #include "base/ref_counted.h" #include "base/shared_memory.h" @@ -44,7 +45,6 @@ #include "media/audio/audio_output.h" class AudioManager; -class Lock; class MessageLoop; struct ViewHostMsg_Audio_CreateStream; diff --git a/chrome/browser/renderer_host/render_widget_helper.h b/chrome/browser/renderer_host/render_widget_helper.h index 48f6087..5392750 100644 --- a/chrome/browser/renderer_host/render_widget_helper.h +++ b/chrome/browser/renderer_host/render_widget_helper.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_ #define CHROME_BROWSER_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_ +#include <map> + #include "base/atomic_sequence_num.h" #include "base/hash_tables.h" #include "base/process.h" diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h index 9489b0f..ad6ec2f 100644 --- a/chrome/browser/safe_browsing/protocol_manager.h +++ b/chrome/browser/safe_browsing/protocol_manager.h @@ -16,6 +16,7 @@ #include "base/hash_tables.h" #include "base/scoped_ptr.h" #include "base/time.h" +#include "base/timer.h" #include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/safe_browsing/chunk_range.h" #include "chrome/browser/safe_browsing/protocol_parser.h" diff --git a/chrome/renderer/media/audio_renderer_impl.h b/chrome/renderer/media/audio_renderer_impl.h index 453c992..71a00fc 100644 --- a/chrome/renderer/media/audio_renderer_impl.h +++ b/chrome/renderer/media/audio_renderer_impl.h @@ -91,6 +91,7 @@ #ifndef CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_ #define CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_ +#include "base/scoped_ptr.h" #include "base/lock.h" #include "base/shared_memory.h" #include "base/waitable_event.h" diff --git a/media/base/mock_media_filters.h b/media/base/mock_media_filters.h index f2f57e1..b90eeb4 100644 --- a/media/base/mock_media_filters.h +++ b/media/base/mock_media_filters.h @@ -7,6 +7,7 @@ #include <string> +#include "base/scoped_ptr.h" #include "base/waitable_event.h" #include "media/base/buffers.h" #include "media/base/factory.h" diff --git a/media/filters/video_thread.h b/media/filters/video_thread.h index 2cab71e..abf632c 100644 --- a/media/filters/video_thread.h +++ b/media/filters/video_thread.h @@ -18,6 +18,7 @@ #include <deque> #include "base/condition_variable.h" +#include "base/lock.h" #include "media/base/filters.h" namespace media { diff --git a/net/disk_cache/disk_cache_test_util.h b/net/disk_cache/disk_cache_test_util.h index e862326..ed960fd 100644 --- a/net/disk_cache/disk_cache_test_util.h +++ b/net/disk_cache/disk_cache_test_util.h @@ -10,6 +10,7 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/task.h" +#include "base/timer.h" // Re-creates a given test file inside the cache test folder. bool CreateCacheTestFile(const wchar_t* name); diff --git a/net/url_request/url_request_new_ftp_job.cc b/net/url_request/url_request_new_ftp_job.cc index 47dfef5..257d1dc 100644 --- a/net/url_request/url_request_new_ftp_job.cc +++ b/net/url_request/url_request_new_ftp_job.cc @@ -4,6 +4,7 @@ #include "net/url_request/url_request_new_ftp_job.h" +#include "base/compiler_specific.h" #include "base/file_version_info.h" #include "base/message_loop.h" #include "net/base/escape.h" diff --git a/views/controls/menu/chrome_menu.h b/views/controls/menu/chrome_menu.h index a01311e..e9f6259 100644 --- a/views/controls/menu/chrome_menu.h +++ b/views/controls/menu/chrome_menu.h @@ -15,6 +15,7 @@ #include "base/gfx/rect.h" #include "base/message_loop.h" #include "base/task.h" +#include "base/timer.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/controls/menu/controller.h" #include "views/event.h" diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index cfaeb7c..88e6244 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -35,6 +35,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/time.h" +#include "base/timer.h" #include "base/thread.h" #include "base/waitable_event.h" #include "net/base/cookie_monster.h" |