diff options
119 files changed, 229 insertions, 196 deletions
diff --git a/app/clipboard/scoped_clipboard_writer.h b/app/clipboard/scoped_clipboard_writer.h index 6869516..61ef5b5 100644 --- a/app/clipboard/scoped_clipboard_writer.h +++ b/app/clipboard/scoped_clipboard_writer.h @@ -15,7 +15,6 @@ #include <string> #include "app/clipboard/clipboard.h" -#include "base/file_path.h" #include "base/string16.h" class Pickle; diff --git a/base/i18n/file_util_icu.h b/base/i18n/file_util_icu.h index bb51a88..a855eb3 100644 --- a/base/i18n/file_util_icu.h +++ b/base/i18n/file_util_icu.h @@ -11,8 +11,6 @@ #include "base/file_path.h" #include "base/string16.h" -class FilePath; - namespace file_util { // Returns true if file_name does not have any illegal character. The input diff --git a/base/scoped_native_library.h b/base/scoped_native_library.h index 41fbe341..bed5c39 100644 --- a/base/scoped_native_library.h +++ b/base/scoped_native_library.h @@ -6,9 +6,10 @@ #define BASE_SCOPED_NATIVE_LIBRARY_H_ #pragma once -#include "base/file_path.h" #include "base/native_library.h" +class FilePath; + namespace base { // A class which encapsulates a base::NativeLibrary object available only in a diff --git a/base/scoped_native_library_unittest.cc b/base/scoped_native_library_unittest.cc index 178e20d..567239d 100644 --- a/base/scoped_native_library_unittest.cc +++ b/base/scoped_native_library_unittest.cc @@ -3,6 +3,9 @@ // found in the LICENSE file. #include "base/scoped_native_library.h" +#if defined(OS_WIN) +#include "base/file_path.h" +#endif #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/accessibility_win_browsertest.cc b/chrome/browser/accessibility_win_browsertest.cc index d946082..4ee4236 100644 --- a/chrome/browser/accessibility_win_browsertest.cc +++ b/chrome/browser/accessibility_win_browsertest.cc @@ -5,7 +5,6 @@ #include <atlbase.h> #include <vector> -#include "base/file_path.h" #include "base/scoped_comptr_win.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc index 230c62a..6452f2f 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc @@ -4,7 +4,6 @@ #include <stdio.h> -#include "base/file_path.h" #include "base/keyboard_codes.h" #include "base/logging.h" #include "base/message_loop.h" diff --git a/chrome/browser/back_forward_menu_model_unittest.cc b/chrome/browser/back_forward_menu_model_unittest.cc index 1de4297..5666002 100644 --- a/chrome/browser/back_forward_menu_model_unittest.cc +++ b/chrome/browser/back_forward_menu_model_unittest.cc @@ -1,11 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/back_forward_menu_model.h" -#include "base/file_path.h" -#include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/child_process_launcher.cc b/chrome/browser/child_process_launcher.cc index 60215d5..f24244f 100644 --- a/chrome/browser/child_process_launcher.cc +++ b/chrome/browser/child_process_launcher.cc @@ -17,6 +17,7 @@ #include "chrome/common/result_codes.h" #if defined(OS_WIN) +#include "base/file_path.h" #include "chrome/common/sandbox_policy.h" #elif defined(OS_LINUX) #include "base/singleton.h" diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc index c7b3e7e..a6fd344 100644 --- a/chrome/browser/chromeos/input_method/candidate_window.cc +++ b/chrome/browser/chromeos/input_method/candidate_window.cc @@ -14,7 +14,6 @@ #include "app/resource_bundle.h" #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/logging.h" #include "base/observer_list.h" #include "base/path_service.h" diff --git a/chrome/browser/chromeos/login/cookie_fetcher.cc b/chrome/browser/chromeos/login/cookie_fetcher.cc index 48c7dec..0ea3c74 100644 --- a/chrome/browser/chromeos/login/cookie_fetcher.cc +++ b/chrome/browser/chromeos/login/cookie_fetcher.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/login/cookie_fetcher.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/path_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/client_login_response_handler.h" diff --git a/chrome/browser/chromeos/login/google_authenticator.h b/chrome/browser/chromeos/login/google_authenticator.h index 155679c..8ddc137 100644 --- a/chrome/browser/chromeos/login/google_authenticator.h +++ b/chrome/browser/chromeos/login/google_authenticator.h @@ -10,7 +10,6 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/gtest_prod_util.h" #include "base/ref_counted.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -30,7 +29,6 @@ class GoogleAuthenticatorTest; class LoginStatusConsumer; class GoogleAuthenticator : public Authenticator, public GaiaAuthConsumer { - public: explicit GoogleAuthenticator(LoginStatusConsumer* consumer); virtual ~GoogleAuthenticator(); diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h index 6dbe94b..1fbae69 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.h +++ b/chrome/browser/chromeos/options/wifi_config_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,6 @@ #include <string> -#include "base/file_path.h" #include "base/gtest_prod_util.h" #include "base/string16.h" #include "chrome/browser/chromeos/cros/network_library.h" @@ -20,6 +19,8 @@ #include "views/controls/textfield/textfield.h" #include "views/view.h" +class FilePath; + namespace chromeos { class NetworkConfigView; diff --git a/chrome/browser/chromeos/pipe_reader.cc b/chrome/browser/chromeos/pipe_reader.cc index 2ed5e7c..8664e35 100644 --- a/chrome/browser/chromeos/pipe_reader.cc +++ b/chrome/browser/chromeos/pipe_reader.cc @@ -1,13 +1,28 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/chromeos/pipe_reader.h" +#include <fcntl.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include "base/file_path.h" #include "base/scoped_ptr.h" namespace chromeos { +PipeReader::PipeReader(const FilePath& pipe_name) + : pipe_(NULL), + pipe_name_(pipe_name.value()) { +} + +PipeReader::~PipeReader() { + if (pipe_) + fclose(pipe_); +} + std::string PipeReader::Read(const uint32 bytes_to_read) { scoped_array<char> buffer(new char[bytes_to_read]); if (pipe_ || (pipe_ = fopen(pipe_name_.c_str(), "r"))) { diff --git a/chrome/browser/chromeos/pipe_reader.h b/chrome/browser/chromeos/pipe_reader.h index 1ebe43b..821fe95 100644 --- a/chrome/browser/chromeos/pipe_reader.h +++ b/chrome/browser/chromeos/pipe_reader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,16 +6,14 @@ #define CHROME_BROWSER_CHROMEOS_PIPE_READER_H_ #pragma once -#include <fcntl.h> #include <stdio.h> -#include <sys/stat.h> -#include <sys/types.h> #include <unistd.h> #include <string> #include "base/basictypes.h" -#include "base/file_path.h" + +class FilePath; namespace chromeos { @@ -30,14 +28,8 @@ namespace chromeos { class PipeReader { public: - explicit PipeReader(const FilePath& pipe_name) - : pipe_(NULL), - pipe_name_(pipe_name.value()) { - } - virtual ~PipeReader() { - if (pipe_) - fclose(pipe_); - } + explicit PipeReader(const FilePath& pipe_name); + virtual ~PipeReader(); // Reads data from the pipe up until either a '\n' or |bytes_to_read| bytes. virtual std::string Read(const uint32 bytes_to_read); diff --git a/chrome/browser/chromeos/pipe_reader_unittest.cc b/chrome/browser/chromeos/pipe_reader_unittest.cc index e745655..3646b30 100644 --- a/chrome/browser/chromeos/pipe_reader_unittest.cc +++ b/chrome/browser/chromeos/pipe_reader_unittest.cc @@ -1,10 +1,13 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/chromeos/pipe_reader.h" #include <errno.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <sys/types.h> #include "base/file_path.h" #include "base/safe_strerror_posix.h" diff --git a/chrome/browser/cocoa/cocoa_test_helper.h b/chrome/browser/cocoa/cocoa_test_helper.h index 343e0ff..7702fd3 100644 --- a/chrome/browser/cocoa/cocoa_test_helper.h +++ b/chrome/browser/cocoa/cocoa_test_helper.h @@ -10,7 +10,6 @@ #import "base/chrome_application_mac.h" #include "base/debug_util.h" -#include "base/file_path.h" #include "base/mac_util.h" #include "base/path_service.h" #import "base/scoped_nsautorelease_pool.h" diff --git a/chrome/browser/cocoa/download_util_mac.h b/chrome/browser/cocoa/download_util_mac.h index b623d71..f71810f 100644 --- a/chrome/browser/cocoa/download_util_mac.h +++ b/chrome/browser/cocoa/download_util_mac.h @@ -1,12 +1,16 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // // Download utility functions for Mac OS X. +#ifndef CHROME_BROWSER_COCOA_DOWNLOAD_UTIL_MAC_H_ +#define CHROME_BROWSER_COCOA_DOWNLOAD_UTIL_MAC_H_ +#pragma once + #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +class FilePath; namespace download_util { @@ -17,3 +21,5 @@ void AddFileToPasteboard(NSPasteboard* pasteboard, const FilePath& path); void NotifySystemOfDownloadComplete(const FilePath& path); } // namespace download_util + +#endif // CHROME_BROWSER_COCOA_DOWNLOAD_UTIL_MAC_H_ diff --git a/chrome/browser/cocoa/web_contents_drag_source.h b/chrome/browser/cocoa/web_contents_drag_source.h index 55e93b9..6fde76a 100644 --- a/chrome/browser/cocoa/web_contents_drag_source.h +++ b/chrome/browser/cocoa/web_contents_drag_source.h @@ -8,7 +8,6 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" @@ -61,4 +60,4 @@ @end -#endif // define CHROME_BROWSER_COCOA_WEB_CONTENTS_DRAG_SOURCE_H_ +#endif // CHROME_BROWSER_COCOA_WEB_CONTENTS_DRAG_SOURCE_H_ diff --git a/chrome/browser/cocoa/web_contents_drag_source.mm b/chrome/browser/cocoa/web_contents_drag_source.mm index 8bc883c..8d74a88 100644 --- a/chrome/browser/cocoa/web_contents_drag_source.mm +++ b/chrome/browser/cocoa/web_contents_drag_source.mm @@ -4,7 +4,6 @@ #import "chrome/browser/cocoa/web_contents_drag_source.h" -#include "base/file_path.h" #include "base/nsimage_cache_mac.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/dom_ui/filebrowse_ui.h b/chrome/browser/dom_ui/filebrowse_ui.h index 4800c1c..25fd8e8 100644 --- a/chrome/browser/dom_ui/filebrowse_ui.h +++ b/chrome/browser/dom_ui/filebrowse_ui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,9 +8,7 @@ #include <string> -#include "base/file_path.h" #include "base/scoped_ptr.h" -#include "base/values.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/dom_ui/fileicon_source.cc b/chrome/browser/dom_ui/fileicon_source.cc index 0987417..599c755 100644 --- a/chrome/browser/dom_ui/fileicon_source.cc +++ b/chrome/browser/dom_ui/fileicon_source.cc @@ -1,10 +1,11 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/dom_ui/fileicon_source.h" #include "base/callback.h" +#include "base/file_path.h" #include "base/ref_counted_memory.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/dom_ui/mediaplayer_ui.h b/chrome/browser/dom_ui/mediaplayer_ui.h index 478926e..33d47a3 100644 --- a/chrome/browser/dom_ui/mediaplayer_ui.h +++ b/chrome/browser/dom_ui/mediaplayer_ui.h @@ -8,10 +8,8 @@ #include <vector> -#include "base/file_path.h" #include "base/scoped_ptr.h" #include "base/singleton.h" -#include "base/values.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/common/notification_observer.h" diff --git a/chrome/browser/dom_ui/new_tab_ui_uitest.cc b/chrome/browser/dom_ui/new_tab_ui_uitest.cc index 8562743..6164e64 100644 --- a/chrome/browser/dom_ui/new_tab_ui_uitest.cc +++ b/chrome/browser/dom_ui/new_tab_ui_uitest.cc @@ -4,7 +4,6 @@ #include "chrome/test/ui/ui_test.h" -#include "base/file_path.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/dom_ui/new_tab_ui.h" diff --git a/chrome/browser/dom_ui/shown_sections_handler_unittest.cc b/chrome/browser/dom_ui/shown_sections_handler_unittest.cc index 934c55a..1ad86f5 100644 --- a/chrome/browser/dom_ui/shown_sections_handler_unittest.cc +++ b/chrome/browser/dom_ui/shown_sections_handler_unittest.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/shown_sections_handler.h" -#include "base/file_path.h" #include "base/scoped_ptr.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/pref_value_store.h" diff --git a/chrome/browser/download/save_file_manager.h b/chrome/browser/download/save_file_manager.h index f473423..4b13acb 100644 --- a/chrome/browser/download/save_file_manager.h +++ b/chrome/browser/download/save_file_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -62,7 +62,6 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/hash_tables.h" #include "base/ref_counted.h" #include "chrome/browser/download/save_types.h" @@ -70,6 +69,7 @@ namespace net { class IOBuffer; } +class FilePath; class GURL; class SaveFile; class SavePackage; diff --git a/chrome/browser/extensions/execute_code_in_tab_function.h b/chrome/browser/extensions/execute_code_in_tab_function.h index 11b9cd8..af8af195 100644 --- a/chrome/browser/extensions/execute_code_in_tab_function.h +++ b/chrome/browser/extensions/execute_code_in_tab_function.h @@ -8,7 +8,6 @@ #include <string> -#include "base/file_path.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/extensions/extension_dom_ui.cc b/chrome/browser/extensions/extension_dom_ui.cc index a6b6fc6..dd9d169 100644 --- a/chrome/browser/extensions/extension_dom_ui.cc +++ b/chrome/browser/extensions/extension_dom_ui.cc @@ -6,8 +6,6 @@ #include <set> -#include "base/file_path.h" -#include "base/file_util.h" #include "net/base/file_stream.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/extensions/extension_i18n_api.cc b/chrome/browser/extensions/extension_i18n_api.cc index f48eee7..41f5dd1 100644 --- a/chrome/browser/extensions/extension_i18n_api.cc +++ b/chrome/browser/extensions/extension_i18n_api.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension_i18n_api.h" +#include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/geolocation/access_token_store.cc b/chrome/browser/geolocation/access_token_store.cc index 7f376ce..da37fc6 100644 --- a/chrome/browser/geolocation/access_token_store.cc +++ b/chrome/browser/geolocation/access_token_store.cc @@ -4,6 +4,7 @@ #include "chrome/browser/geolocation/access_token_store.h" +#include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.cc b/chrome/browser/geolocation/geolocation_content_settings_map.cc index d734a24..f552234 100644 --- a/chrome/browser/geolocation/geolocation_content_settings_map.cc +++ b/chrome/browser/geolocation/geolocation_content_settings_map.cc @@ -15,6 +15,7 @@ #include "chrome/browser/geolocation/geolocation_content_settings_map.h" +#include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/pref_service.h" diff --git a/chrome/browser/geolocation/geolocation_permission_context.h b/chrome/browser/geolocation/geolocation_permission_context.h index 26351f9..c93fec3 100644 --- a/chrome/browser/geolocation/geolocation_permission_context.h +++ b/chrome/browser/geolocation/geolocation_permission_context.h @@ -7,7 +7,6 @@ #pragma once #include "base/basictypes.h" -#include "base/file_path.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" diff --git a/chrome/browser/geolocation/geolocation_settings_state.cc b/chrome/browser/geolocation/geolocation_settings_state.cc index 6f8548e..8c37ce5 100644 --- a/chrome/browser/geolocation/geolocation_settings_state.cc +++ b/chrome/browser/geolocation/geolocation_settings_state.cc @@ -4,6 +4,7 @@ #include "chrome/browser/geolocation/geolocation_settings_state.h" +#include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/pref_service.h" diff --git a/chrome/browser/host_zoom_map.cc b/chrome/browser/host_zoom_map.cc index b676cf4..a9e9ef4 100644 --- a/chrome/browser/host_zoom_map.cc +++ b/chrome/browser/host_zoom_map.cc @@ -4,6 +4,7 @@ #include "chrome/browser/host_zoom_map.h" +#include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/pref_service.h" diff --git a/chrome/browser/icon_loader.h b/chrome/browser/icon_loader.h index 9c9d648..32b4048 100644 --- a/chrome/browser/icon_loader.h +++ b/chrome/browser/icon_loader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,10 +6,14 @@ #define CHROME_BROWSER_ICON_LOADER_H_ #pragma once +#include "build/build_config.h" + #include <string> #include "base/basictypes.h" +#if defined(TOOLKIT_USES_GTK) #include "base/file_path.h" +#endif #include "base/ref_counted.h" #if defined(OS_WIN) diff --git a/chrome/browser/importer/firefox_importer_utils.h b/chrome/browser/importer/firefox_importer_utils.h index 04bdefb..e2e2381 100644 --- a/chrome/browser/importer/firefox_importer_utils.h +++ b/chrome/browser/importer/firefox_importer_utils.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,10 +9,10 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "build/build_config.h" class DictionaryValue; +class FilePath; class GURL; class TemplateURL; diff --git a/chrome/browser/importer/firefox_proxy_settings.cc b/chrome/browser/importer/firefox_proxy_settings.cc index 55ccc3e..d2c3e1b 100644 --- a/chrome/browser/importer/firefox_proxy_settings.cc +++ b/chrome/browser/importer/firefox_proxy_settings.cc @@ -4,6 +4,7 @@ #include "chrome/browser/importer/firefox_proxy_settings.h" +#include "base/file_path.h" #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/values.h" diff --git a/chrome/browser/importer/nss_decryptor_mac.h b/chrome/browser/importer/nss_decryptor_mac.h index 5415d4c..8d44a01 100644 --- a/chrome/browser/importer/nss_decryptor_mac.h +++ b/chrome/browser/importer/nss_decryptor_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,8 +10,10 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/logging.h" +#include "base/string16.h" + +class FilePath; // The following declarations of functions and types are from Firefox // NSS library. diff --git a/chrome/browser/importer/nss_decryptor_mac.mm b/chrome/browser/importer/nss_decryptor_mac.mm index e319c74..988ab56 100644 --- a/chrome/browser/importer/nss_decryptor_mac.mm +++ b/chrome/browser/importer/nss_decryptor_mac.mm @@ -6,13 +6,13 @@ #include <dlfcn.h> +#include "base/file_path.h" +#include "base/logging.h" #include "base/sys_string_conversions.h" #include "chrome/browser/importer/nss_decryptor_mac.h" #include "chrome/browser/importer/firefox_importer_utils.h" -#include "base/logging.h" - // static const wchar_t NSSDecryptor::kNSS3Library[] = L"libnss3.dylib"; diff --git a/chrome/browser/importer/nss_decryptor_system_nss.h b/chrome/browser/importer/nss_decryptor_system_nss.h index 9c3d921..c08496d 100644 --- a/chrome/browser/importer/nss_decryptor_system_nss.h +++ b/chrome/browser/importer/nss_decryptor_system_nss.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,9 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/string16.h" + +class FilePath; namespace webkit_glue { struct PasswordForm; diff --git a/chrome/browser/in_process_webkit/dom_storage_area.cc b/chrome/browser/in_process_webkit/dom_storage_area.cc index 7ec5b8c..4fa247f 100644 --- a/chrome/browser/in_process_webkit/dom_storage_area.cc +++ b/chrome/browser/in_process_webkit/dom_storage_area.cc @@ -4,8 +4,6 @@ #include "chrome/browser/in_process_webkit/dom_storage_area.h" -#include "base/file_path.h" -#include "base/file_util.h" #include "base/task.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/in_process_webkit/dom_storage_context.h" diff --git a/chrome/browser/notifications/notifications_interactive_uitest.cc b/chrome/browser/notifications/notifications_interactive_uitest.cc index e9a3efb..97bb1e2 100644 --- a/chrome/browser/notifications/notifications_interactive_uitest.cc +++ b/chrome/browser/notifications/notifications_interactive_uitest.cc @@ -1,8 +1,7 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // 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 "chrome/common/chrome_switches.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/browser/parsers/metadata_parser.h b/chrome/browser/parsers/metadata_parser.h index f9b9006..ae623fc 100644 --- a/chrome/browser/parsers/metadata_parser.h +++ b/chrome/browser/parsers/metadata_parser.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <string> -#include "base/file_path.h" +class FilePath; // Allows for Iteration on the Properties of a given file. class MetadataPropertyIterator { diff --git a/chrome/browser/parsers/metadata_parser_factory.h b/chrome/browser/parsers/metadata_parser_factory.h index 80f88eb..0609657 100644 --- a/chrome/browser/parsers/metadata_parser_factory.h +++ b/chrome/browser/parsers/metadata_parser_factory.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,8 @@ #include "chrome/browser/parsers/metadata_parser.h" +class FilePath; + // Used to check to see if a parser can parse a particular file, and allows // for creation of a parser on a particular file. class MetadataParserFactory { diff --git a/chrome/browser/parsers/metadata_parser_filebase.h b/chrome/browser/parsers/metadata_parser_filebase.h index 8fc48a7..8b232a2 100644 --- a/chrome/browser/parsers/metadata_parser_filebase.h +++ b/chrome/browser/parsers/metadata_parser_filebase.h @@ -6,6 +6,11 @@ #define CHROME_BROWSER_PARSERS_METADATA_PARSER_FILEBASE_H_ #pragma once +#include <string> + +#include "base/basictypes.h" +#include "base/file_path.h" +#include "base/hash_tables.h" #include "chrome/browser/parsers/metadata_parser.h" typedef base::hash_map<std::string, std::string> PropertyMap; diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc index 3b60abf..2eb47d2 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc +++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc @@ -1,12 +1,13 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/parsers/metadata_parser_jpeg_factory.h" -#include "chrome/browser/parsers/metadata_parser_jpeg.h" +#include "base/file_path.h" #include "base/logging.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/parsers/metadata_parser_jpeg.h" MetadataParserJpegFactory::MetadataParserJpegFactory() : MetadataParserFactory() { diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.h b/chrome/browser/parsers/metadata_parser_jpeg_factory.h index bf8c150..9a4546a 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg_factory.h +++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,8 +6,11 @@ #define CHROME_BROWSER_PARSERS_METADATA_PARSER_JPEG_FACTORY_H_ #pragma once +#include "base/basictypes.h" #include "chrome/browser/parsers/metadata_parser_factory.h" +class FilePath; + class MetadataParserJpegFactory : public MetadataParserFactory { public: MetadataParserJpegFactory(); diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc index aaa31aa..7de33ad 100644 --- a/chrome/browser/password_manager/password_manager_unittest.cc +++ b/chrome/browser/password_manager/password_manager_unittest.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/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_manager.h" diff --git a/chrome/browser/password_manager/password_store_default.h b/chrome/browser/password_manager/password_store_default.h index 70dc2e3c..4906ce8 100644 --- a/chrome/browser/password_manager/password_store_default.h +++ b/chrome/browser/password_manager/password_store_default.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT_H_ #pragma once -#include "base/file_path.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "chrome/browser/password_manager/login_database.h" diff --git a/chrome/browser/password_manager/password_store_win.h b/chrome/browser/password_manager/password_store_win.h index 12e6c92..c887cc8 100644 --- a/chrome/browser/password_manager/password_store_win.h +++ b/chrome/browser/password_manager/password_store_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,6 @@ #include <map> #include <vector> -#include "base/file_path.h" #include "base/scoped_ptr.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/password_manager/password_store_default.h" diff --git a/chrome/browser/pref_member_unittest.cc b/chrome/browser/pref_member_unittest.cc index e280c72..acc5442 100644 --- a/chrome/browser/pref_member_unittest.cc +++ b/chrome/browser/pref_member_unittest.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/file_path.h" #include "chrome/browser/dummy_pref_store.h" #include "chrome/browser/pref_member.h" #include "chrome/browser/pref_value_store.h" diff --git a/chrome/browser/pref_service.h b/chrome/browser/pref_service.h index 6489b32..8c56d7c 100644 --- a/chrome/browser/pref_service.h +++ b/chrome/browser/pref_service.h @@ -12,13 +12,13 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/non_thread_safe.h" #include "base/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/pref_value_store.h" #include "chrome/common/pref_store.h" +class FilePath; class NotificationObserver; class PrefNotifier; class Profile; diff --git a/chrome/browser/pref_value_store.h b/chrome/browser/pref_value_store.h index c1901f6..e0ac64d 100644 --- a/chrome/browser/pref_value_store.h +++ b/chrome/browser/pref_value_store.h @@ -11,18 +11,18 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/gtest_prod_util.h" #include "base/ref_counted.h" #include "base/string16.h" #include "base/scoped_ptr.h" -#include "base/values.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/pref_notifier.h" #include "chrome/common/pref_store.h" +class FilePath; class PrefStore; class Profile; +class Value; // The PrefValueStore manages various sources of values for Preferences // (e.g., configuration policies, extensions, and user settings). It returns diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h index d3b5c4a..3b357b1 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h @@ -9,7 +9,6 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/observer_list.h" #include "base/scoped_ptr.h" #include "chrome/browser/profile.h" @@ -39,4 +38,3 @@ class CloudPrintProxyService { }; #endif // CHROME_BROWSER_PRINTING_CLOUD_PRINT_CLOUD_PRINT_PROXY_SERVICE_H_ - diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index c6233fc..19e40a6 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,13 +13,16 @@ #endif #include "base/basictypes.h" +#if defined(USE_X11) #include "base/file_path.h" +#endif #include "base/logging.h" #include "base/non_thread_safe.h" #include "base/ref_counted.h" #include "gfx/native_widget_types.h" class CommandLine; +class FilePath; // ProcessSingleton ---------------------------------------------------------- // @@ -129,7 +132,7 @@ class ProcessSingleton : public NonThreadSafe { HWND remote_window_; // The HWND_MESSAGE of another browser. HWND window_; // The HWND_MESSAGE window. -#elif !defined(OS_MACOSX) +#elif defined(USE_X11) // Path in file system to the socket. FilePath socket_path_; diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h index da63eae..efd8982 100644 --- a/chrome/browser/profile.h +++ b/chrome/browser/profile.h @@ -9,7 +9,6 @@ #pragma once #include "base/basictypes.h" -#include "base/file_path.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/timer.h" @@ -48,6 +47,7 @@ class ExtensionProcessManager; class ExtensionMessageService; class ExtensionsService; class FaviconService; +class FilePath; class FindBarState; class GeolocationContentSettingsMap; class GeolocationPermissionContext; diff --git a/chrome/browser/profile_impl.h b/chrome/browser/profile_impl.h index 6e2230f..7588a5f 100644 --- a/chrome/browser/profile_impl.h +++ b/chrome/browser/profile_impl.h @@ -8,6 +8,7 @@ #define CHROME_BROWSER_PROFILE_IMPL_H_ #pragma once +#include "base/file_path.h" #include "chrome/browser/profile.h" #include "chrome/browser/spellcheck_host_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/profile_manager.h b/chrome/browser/profile_manager.h index 01a5b2e..4d540f1 100644 --- a/chrome/browser/profile_manager.h +++ b/chrome/browser/profile_manager.h @@ -12,14 +12,14 @@ #include "app/system_monitor.h" #include "base/basictypes.h" -#include "base/file_path.h" #include "base/message_loop.h" #include "base/non_thread_safe.h" -#include "base/values.h" #include "chrome/browser/profile.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +class FilePath; + class ProfileManager : public NonThreadSafe, public SystemMonitor::PowerObserver, public NotificationObserver { diff --git a/chrome/browser/renderer_host/download_resource_handler.h b/chrome/browser/renderer_host/download_resource_handler.h index adfff13..b2caa0a 100644 --- a/chrome/browser/renderer_host/download_resource_handler.h +++ b/chrome/browser/renderer_host/download_resource_handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,6 @@ #include <string> -#include "base/file_path.h" #include "base/timer.h" #include "chrome/browser/download/download_file.h" #include "chrome/browser/renderer_host/global_request_id.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_store.cc b/chrome/browser/safe_browsing/safe_browsing_store.cc index 21fd37f..b90e98d 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store.cc +++ b/chrome/browser/safe_browsing/safe_browsing_store.cc @@ -4,6 +4,8 @@ #include "chrome/browser/safe_browsing/safe_browsing_store.h" +#include <algorithm> + namespace { // Find items matching between |subs| and |adds|, and remove them, @@ -135,6 +137,7 @@ void SBProcessSubs(std::vector<SBAddPrefix>* add_prefixes, RemoveMatchingPrefixes(removed_adds, add_full_hashes); RemoveMatchingPrefixes(removed_adds, sub_full_hashes); + // http://crbug.com/52385 // TODO(shess): AFAICT this pass is not done on the trunk. I // believe that's a bug, but it may not matter because full-hash // subs almost never happen (I think you'd need multiple collisions diff --git a/chrome/browser/safe_browsing/safe_browsing_store.h b/chrome/browser/safe_browsing/safe_browsing_store.h index dd161f9..92d6e93 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store.h +++ b/chrome/browser/safe_browsing/safe_browsing_store.h @@ -10,11 +10,12 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/task.h" #include "base/time.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" +class FilePath; + // SafeBrowsingStore provides a storage abstraction for the // safe-browsing data used to build the bloom filter. The items // stored are: diff --git a/chrome/browser/safe_browsing/safe_browsing_store_sqlite.h b/chrome/browser/safe_browsing/safe_browsing_store_sqlite.h index 8603794..92e986f 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_sqlite.h +++ b/chrome/browser/safe_browsing/safe_browsing_store_sqlite.h @@ -10,6 +10,7 @@ #include <vector> #include "base/callback.h" +#include "base/file_path.h" #include "chrome/browser/safe_browsing/safe_browsing_store.h" #include "testing/gtest/include/gtest/gtest_prod.h" diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index 9b76dc7..57dd7b7 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -5,6 +5,7 @@ #include "chrome/browser/service/service_process_control.h" #include "base/command_line.h" +#include "base/file_path.h" #include "base/process_util.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index ddb0f64..79f2be8 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/chrome/browser/session_history_uitest.cc @@ -1,8 +1,7 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // 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/platform_thread.h" #include "base/string_util.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/session_startup_pref.cc b/chrome/browser/session_startup_pref.cc index b0c2b6e..1098ed4 100644 --- a/chrome/browser/session_startup_pref.cc +++ b/chrome/browser/session_startup_pref.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #include <string> +#include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/pref_service.h" diff --git a/chrome/browser/sync/engine/syncapi.h b/chrome/browser/sync/engine/syncapi.h index f748106..65000b7 100644 --- a/chrome/browser/sync/engine/syncapi.h +++ b/chrome/browser/sync/engine/syncapi.h @@ -43,7 +43,6 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" #include "build/build_config.h" @@ -53,6 +52,8 @@ #include "chrome/browser/sync/util/cryptographer.h" #include "googleurl/src/gurl.h" +class FilePath; + namespace browser_sync { class ModelSafeWorkerRegistrar; diff --git a/chrome/browser/sync/glue/extension_sync_traits.cc b/chrome/browser/sync/glue/extension_sync_traits.cc index 7ea54d3..18e102b 100644 --- a/chrome/browser/sync/glue/extension_sync_traits.cc +++ b/chrome/browser/sync/glue/extension_sync_traits.cc @@ -4,6 +4,7 @@ #include "chrome/browser/sync/glue/extension_sync_traits.h" +#include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "chrome/browser/sync/engine/syncapi.h" #include "chrome/browser/sync/protocol/app_specifics.pb.h" diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 92251ce..ab0d2f3 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -10,8 +10,6 @@ #include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/file_path.h" -#include "base/file_util.h" #include "base/histogram.h" #include "base/logging.h" #include "base/stl_util-inl.h" diff --git a/chrome/browser/sync/util/user_settings.h b/chrome/browser/sync/util/user_settings.h index 0ddc0cb..5545c8c 100644 --- a/chrome/browser/sync/util/user_settings.h +++ b/chrome/browser/sync/util/user_settings.h @@ -9,12 +9,13 @@ #include <map> #include <string> -#include "base/file_path.h" #include "base/lock.h" #include "build/build_config.h" extern "C" struct sqlite3; +class FilePath; + namespace browser_sync { void ExecOrDie(sqlite3* dbhandle, const char *query); diff --git a/chrome/browser/views/extensions/browser_action_drag_data.cc b/chrome/browser/views/extensions/browser_action_drag_data.cc index 2d772ea..6ab54ce 100644 --- a/chrome/browser/views/extensions/browser_action_drag_data.cc +++ b/chrome/browser/views/extensions/browser_action_drag_data.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/extensions/browser_action_drag_data.h" -#include "base/file_path.h" #include "base/logging.h" #include "base/pickle.h" #include "base/string_util.h" diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.cc b/chrome/browser/views/tab_contents/tab_contents_view_win.cc index cd64382..91e2036 100644 --- a/chrome/browser/views/tab_contents/tab_contents_view_win.cc +++ b/chrome/browser/views/tab_contents/tab_contents_view_win.cc @@ -6,7 +6,6 @@ #include <windows.h> -#include "base/file_path.h" #include "base/time.h" #include "chrome/browser/browser.h" // TODO(beng): this dependency is awful. #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 7b697ac..16e0c33 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -5,6 +5,7 @@ #include "chrome/browser/web_resource/web_resource_service.h" #include "base/command_line.h" +#include "base/file_path.h" #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/time.h" diff --git a/chrome/browser/web_resource/web_resource_service.h b/chrome/browser/web_resource/web_resource_service.h index 5604eec..52868fb 100644 --- a/chrome/browser/web_resource/web_resource_service.h +++ b/chrome/browser/web_resource/web_resource_service.h @@ -8,6 +8,7 @@ #include <string> +#include "base/file_path.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/utility_process_host.h" #include "chrome/common/web_resource/web_resource_unpacker.h" @@ -88,4 +89,3 @@ class WebResourceService }; #endif // CHROME_BROWSER_WEB_RESOURCE_WEB_RESOURCE_SERVICE_H_ - diff --git a/chrome/common/child_process_host.h b/chrome/common/child_process_host.h index 7423a42..8eb050b 100644 --- a/chrome/common/child_process_host.h +++ b/chrome/common/child_process_host.h @@ -15,12 +15,12 @@ #endif // defined(OS_WIN) #include "base/basictypes.h" -#include "base/file_path.h" #include "base/scoped_ptr.h" #include "chrome/common/notification_type.h" #include "ipc/ipc_channel.h" class CommandLine; +class FilePath; namespace IPC { class Message; @@ -123,4 +123,3 @@ class ChildProcessHost : public IPC::Channel::Listener { }; #endif // CHROME_COMMON_CHILD_PROCESS_HOST_H_ - diff --git a/chrome/common/chrome_paths_internal.h b/chrome/common/chrome_paths_internal.h index cddb88f..38fbac2 100644 --- a/chrome/common/chrome_paths_internal.h +++ b/chrome/common/chrome_paths_internal.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,8 @@ #pragma once #include "build/build_config.h" -#include "base/file_path.h" + +class FilePath; namespace chrome { diff --git a/chrome/common/extensions/extension_file_util.h b/chrome/common/extensions/extension_file_util.h index cfa69cc..a938a24 100644 --- a/chrome/common/extensions/extension_file_util.h +++ b/chrome/common/extensions/extension_file_util.h @@ -8,10 +8,10 @@ #include <string> -#include "base/file_path.h" #include "chrome/common/extensions/extension.h" class ExtensionMessageBundle; +class FilePath; // Utilties for manipulating the on-disk storage of extensions. namespace extension_file_util { @@ -72,6 +72,6 @@ bool CheckForIllegalFilenames(const FilePath& extension_path, // Get a relative file path from a chrome-extension:// URL. FilePath ExtensionURLToRelativeFilePath(const GURL& url); -} // extension_file_util +} // namespace extension_file_util #endif // CHROME_COMMON_EXTENSIONS_EXTENSION_FILE_UTIL_H_ diff --git a/chrome/common/pepper_plugin_registry.h b/chrome/common/pepper_plugin_registry.h index 4c212e5..562d26c 100644 --- a/chrome/common/pepper_plugin_registry.h +++ b/chrome/common/pepper_plugin_registry.h @@ -10,6 +10,7 @@ #include <map> #include <vector> +#include "base/file_path.h" #include "webkit/glue/plugins/pepper_plugin_module.h" struct PepperPluginInfo { diff --git a/chrome/common/sandbox_init_wrapper_mac.cc b/chrome/common/sandbox_init_wrapper_mac.cc index 79cf08f..aaa69eb 100644 --- a/chrome/common/sandbox_init_wrapper_mac.cc +++ b/chrome/common/sandbox_init_wrapper_mac.cc @@ -1,10 +1,11 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/common/sandbox_init_wrapper.h" #include "base/command_line.h" +#include "base/file_path.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/sandbox_mac.h" diff --git a/chrome/common/sandbox_mac.h b/chrome/common/sandbox_mac.h index cc20203..61a02fc 100644 --- a/chrome/common/sandbox_mac.h +++ b/chrome/common/sandbox_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,12 +6,11 @@ #define CHROME_COMMON_SANDBOX_MAC_H_ #pragma once -#include "base/file_path.h" +class FilePath; namespace sandbox { enum SandboxProcessType { - SANDBOX_TYPE_FIRST_TYPE, // Placeholder to ease iteration. SANDBOX_TYPE_RENDERER = SANDBOX_TYPE_FIRST_TYPE, diff --git a/chrome/common/sandbox_mac_unittest_helper.mm b/chrome/common/sandbox_mac_unittest_helper.mm index 5b421c6..007530e 100644 --- a/chrome/common/sandbox_mac_unittest_helper.mm +++ b/chrome/common/sandbox_mac_unittest_helper.mm @@ -10,6 +10,7 @@ extern "C" { #include <map> +#include "base/file_path.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "chrome/common/sandbox_mac.h" diff --git a/chrome/common/sandbox_policy.h b/chrome/common/sandbox_policy.h index ce8777d..04a9b88 100644 --- a/chrome/common/sandbox_policy.h +++ b/chrome/common/sandbox_policy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,9 +7,9 @@ #pragma once #include "base/process.h" -#include "base/file_path.h" class CommandLine; +class FilePath; namespace sandbox { diff --git a/chrome/common/utility_messages.cc b/chrome/common/utility_messages.cc index 4c8e567..90b0a29 100644 --- a/chrome/common/utility_messages.cc +++ b/chrome/common/utility_messages.cc @@ -4,6 +4,7 @@ #include "chrome/common/utility_messages.h" +#include "base/values.h" #define MESSAGES_INTERNAL_IMPL_FILE \ "chrome/common/utility_messages_internal.h" #include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/common/utility_messages.h b/chrome/common/utility_messages.h index 3094963..49bc9ce 100644 --- a/chrome/common/utility_messages.h +++ b/chrome/common/utility_messages.h @@ -9,8 +9,6 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" -#include "base/values.h" #include "chrome/common/common_param_traits.h" #include "chrome/common/extensions/update_manifest.h" #include "chrome/common/indexed_db_param_traits.h" diff --git a/chrome/common/web_resource/web_resource_unpacker.h b/chrome/common/web_resource/web_resource_unpacker.h index 3b89a61..c49f2fa 100644 --- a/chrome/common/web_resource/web_resource_unpacker.h +++ b/chrome/common/web_resource/web_resource_unpacker.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,7 +15,7 @@ #include <string> -#include "base/file_path.h" +#include "base/basictypes.h" #include "base/scoped_ptr.h" class DictionaryValue; @@ -54,5 +54,3 @@ class WebResourceUnpacker { }; #endif // CHROME_COMMON_WEB_RESOURCE_WEB_RESOURCE_UNPACKER_H_ - - diff --git a/chrome/common/zip.h b/chrome/common/zip.h index eaec297..069d150 100644 --- a/chrome/common/zip.h +++ b/chrome/common/zip.h @@ -6,7 +6,7 @@ #define CHROME_COMMON_ZIP_H_ #pragma once -#include "base/file_path.h" +class FilePath; // Zip the contents of src_dir into dest_file. src_path must be a directory. // An entry will *not* be created in the zip for the root folder -- children diff --git a/chrome/gpu/gpu_info_collector_win.cc b/chrome/gpu/gpu_info_collector_win.cc index 07b7c5b..27b3563 100644 --- a/chrome/gpu/gpu_info_collector_win.cc +++ b/chrome/gpu/gpu_info_collector_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,6 +7,7 @@ #include <windows.h> #include <d3d9.h> +#include "base/file_path.h" #include "base/logging.h" #include "base/scoped_native_library.h" #include "base/string_util.h" diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 41b1c95..114bdd4 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <string> #include <windows.h> #include <msi.h> #include <shellapi.h> #include <shlobj.h> +#include <string> + #include "base/at_exit.h" #include "base/basictypes.h" #include "base/command_line.h" @@ -18,6 +19,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_switches.h" #include "chrome/installer/setup/install.h" diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h index 22de943..0082a17 100644 --- a/chrome/installer/util/master_preferences.h +++ b/chrome/installer/util/master_preferences.h @@ -12,11 +12,12 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" -#include "base/values.h" #include "googleurl/src/gurl.h" #include "chrome/installer/util/master_preferences_constants.h" +class DictionaryValue; +class FilePath; + namespace installer_util { // This is the default name for the master preferences file used to pre-set diff --git a/chrome/installer/util/move_tree_work_item.h b/chrome/installer/util/move_tree_work_item.h index 98fe679..69aa845 100644 --- a/chrome/installer/util/move_tree_work_item.h +++ b/chrome/installer/util/move_tree_work_item.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,9 +6,11 @@ #define CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_ #pragma once -#include <string> #include <windows.h> +#include <string> + +#include "base/file_path.h" #include "chrome/installer/util/work_item.h" // A WorkItem subclass that recursively move a file system hierarchy from diff --git a/chrome/installer/util/work_item.h b/chrome/installer/util/work_item.h index c550adb..3b26d3a 100644 --- a/chrome/installer/util/work_item.h +++ b/chrome/installer/util/work_item.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -13,13 +13,12 @@ #include <windows.h> #include <string> -#include "base/file_path.h" - class CopyTreeWorkItem; class CreateDirWorkItem; class CreateRegKeyWorkItem; class DeleteTreeWorkItem; class DeleteRegValueWorkItem; +class FilePath; class MoveTreeWorkItem; class SelfRegWorkItem; class SetRegValueWorkItem; diff --git a/chrome/installer/util/work_item_list.h b/chrome/installer/util/work_item_list.h index 4ed9a59..cbf68a3 100644 --- a/chrome/installer/util/work_item_list.h +++ b/chrome/installer/util/work_item_list.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,10 +11,10 @@ #include <list> #include <string> -#include "base/file_path.h" - #include "chrome/installer/util/work_item.h" +class FilePath; + // A WorkItem subclass that recursively contains a list of WorkItems. Thus it // provides functionalities to carry out or roll back the sequence of actions // defined by the list of WorkItems it contains. diff --git a/chrome/nacl/nacl_thread.h b/chrome/nacl/nacl_thread.h index 33cccae..f7272d1 100644 --- a/chrome/nacl/nacl_thread.h +++ b/chrome/nacl/nacl_thread.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,6 @@ #define CHROME_NACL_NACL_THREAD_H_ #pragma once -#include "base/file_path.h" #include "base/native_library.h" #include "chrome/common/child_thread.h" #include "chrome/common/nacl_types.h" diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc index 6383612..4cba462 100644 --- a/chrome/renderer/blocked_plugin.cc +++ b/chrome/renderer/blocked_plugin.cc @@ -6,7 +6,6 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "base/file_path.h" #include "base/string_piece.h" #include "base/values.h" #include "chrome/common/jstemplate_builder.h" diff --git a/chrome/renderer/external_extension_uitest.cc b/chrome/renderer/external_extension_uitest.cc index 064f768..00784a8 100644 --- a/chrome/renderer/external_extension_uitest.cc +++ b/chrome/renderer/external_extension_uitest.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/file_path.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/service/cloud_print/job_status_updater.h b/chrome/service/cloud_print/job_status_updater.h index c03b04e..4fa07eb 100644 --- a/chrome/service/cloud_print/job_status_updater.h +++ b/chrome/service/cloud_print/job_status_updater.h @@ -8,7 +8,6 @@ #include <string> -#include "base/file_path.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/thread.h" @@ -73,4 +72,3 @@ class JobStatusUpdater : public base::RefCountedThreadSafe<JobStatusUpdater>, typedef JobStatusUpdater::Delegate JobStatusUpdaterDelegate; #endif // CHROME_SERVICE_CLOUD_PRINT_JOB_STATUS_UPDATER_H_ - diff --git a/chrome/service/cloud_print/print_system.h b/chrome/service/cloud_print/print_system.h index 586e672..b0e287d 100644 --- a/chrome/service/cloud_print/print_system.h +++ b/chrome/service/cloud_print/print_system.h @@ -10,9 +10,10 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/ref_counted.h" -#include "base/values.h" + +class DictionaryValue; +class FilePath; // This is the interface for platform-specific code for cloud print namespace cloud_print { diff --git a/chrome/service/service_child_process_host.cc b/chrome/service/service_child_process_host.cc index cea04fe..c7cbea2e 100644 --- a/chrome/service/service_child_process_host.cc +++ b/chrome/service/service_child_process_host.cc @@ -7,7 +7,9 @@ #include "base/logging.h" #include "base/process_util.h" #include "chrome/common/result_codes.h" + #if defined(OS_WIN) +#include "base/file_path.h" #include "chrome/common/sandbox_policy.h" #endif // defined(OS_WIN) @@ -30,4 +32,3 @@ bool ServiceChildProcessHost::Launch(CommandLine* cmd_line) { return (handle() != base::kNullProcessHandle); #endif // !defined(OS_WIN) } - diff --git a/chrome/service/service_utility_process_host.h b/chrome/service/service_utility_process_host.h index 2b964eb..c069426 100644 --- a/chrome/service/service_utility_process_host.h +++ b/chrome/service/service_utility_process_host.h @@ -6,6 +6,8 @@ #define CHROME_SERVICE_SERVICE_UTILITY_PROCESS_HOST_H_ #pragma once +#include "build/build_config.h" + #if defined(OS_WIN) #include <windows.h> #endif // defined(OS_WIN) @@ -13,7 +15,6 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/ref_counted.h" #include "base/task.h" #include "ipc/ipc_channel.h" @@ -21,6 +22,7 @@ #include "printing/native_metafile.h" class CommandLine; +class FilePath; namespace base { class MessageLoopProxy; @@ -118,4 +120,3 @@ class ServiceUtilityProcessHost : public ServiceChildProcessHost { }; #endif // CHROME_SERVICE_SERVICE_UTILITY_PROCESS_HOST_H_ - diff --git a/chrome/test/chrome_process_util.h b/chrome/test/chrome_process_util.h index 210c3bd..a649852 100644 --- a/chrome/test/chrome_process_util.h +++ b/chrome/test/chrome_process_util.h @@ -8,7 +8,6 @@ #include <vector> -#include "base/file_path.h" #include "base/process_util.h" #include "base/scoped_ptr.h" diff --git a/chrome/utility/utility_thread.cc b/chrome/utility/utility_thread.cc index c759c0d..fd6abce 100644 --- a/chrome/utility/utility_thread.cc +++ b/chrome/utility/utility_thread.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,6 +11,7 @@ #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" diff --git a/chrome_frame/chrome_launcher_utils.h b/chrome_frame/chrome_launcher_utils.h index c72569b..31698c5 100644 --- a/chrome_frame/chrome_launcher_utils.h +++ b/chrome_frame/chrome_launcher_utils.h @@ -1,15 +1,14 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_FRAME_CHROME_LAUNCHER_H_ -#define CHROME_FRAME_CHROME_LAUNCHER_H_ +#ifndef CHROME_FRAME_CHROME_LAUNCHER_UTILS_H_ +#define CHROME_FRAME_CHROME_LAUNCHER_UTILS_H_ #include <string> -#include "base/file_path.h" - class CommandLine; +class FilePath; namespace chrome_launcher { @@ -29,4 +28,4 @@ FilePath GetChromeExecutablePath(); } // namespace chrome_launcher -#endif // CHROME_FRAME_CHROME_LAUNCHER_H_ +#endif // CHROME_FRAME_CHROME_LAUNCHER_UTILS_H_ diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h index 3e63009..199be72 100644 --- a/chrome_frame/test/chrome_frame_test_utils.h +++ b/chrome_frame/test/chrome_frame_test_utils.h @@ -7,7 +7,6 @@ #include <atlbase.h> #include <atlcom.h> -#include <string> #include <exdisp.h> #include <exdispid.h> #include <mshtml.h> @@ -15,7 +14,10 @@ #include <shobjidl.h> #include <windows.h> +#include <string> + #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/process_util.h" #include "base/scoped_comptr_win.h" diff --git a/chrome_frame/test/net/process_singleton_subclass.h b/chrome_frame/test/net/process_singleton_subclass.h index dd9ce36..6846c1d 100644 --- a/chrome_frame/test/net/process_singleton_subclass.h +++ b/chrome_frame/test/net/process_singleton_subclass.h @@ -1,12 +1,14 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef CHROME_FRAME_TEST_NET_PROCESS_SINGLETON_SUBCLASS_H_ #define CHROME_FRAME_TEST_NET_PROCESS_SINGLETON_SUBCLASS_H_ #include <windows.h> -#include "base/file_path.h" +#include <string> + +class FilePath; struct FunctionStub; class ProcessSingletonSubclassDelegate { @@ -17,7 +19,7 @@ class ProcessSingletonSubclassDelegate { class ProcessSingletonSubclass { public: - ProcessSingletonSubclass(ProcessSingletonSubclassDelegate* delegate); + explicit ProcessSingletonSubclass(ProcessSingletonSubclassDelegate* delegate); ~ProcessSingletonSubclass(); bool Subclass(const FilePath& user_data_dir); @@ -33,4 +35,3 @@ class ProcessSingletonSubclass { }; #endif // CHROME_FRAME_TEST_NET_PROCESS_SINGLETON_SUBCLASS_H_ - diff --git a/chrome_frame/test/util_unittests.cc b/chrome_frame/test/util_unittests.cc index 95c55c7..f8ef22e 100644 --- a/chrome_frame/test/util_unittests.cc +++ b/chrome_frame/test/util_unittests.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/file_path.h" #include "base/file_version_info.h" #include "base/file_version_info_win.h" #include "chrome_frame/utils.h" @@ -284,4 +285,3 @@ TEST(UtilTests, ParseVersionTest) { EXPECT_TRUE(ParseVersion(L"1.2.3.4", &high, &low) && high == 1 && low == 2); EXPECT_TRUE(ParseVersion(L"10.20", &high, &low) && high == 10 && low == 20); } - diff --git a/chrome_frame/test_utils.h b/chrome_frame/test_utils.h index 741d541..70284fb 100644 --- a/chrome_frame/test_utils.h +++ b/chrome_frame/test_utils.h @@ -10,7 +10,7 @@ #include <atlbase.h> #include <atlcom.h> -#include "base/file_path.h" +class FilePath; extern const wchar_t kChromeFrameDllName[]; extern const wchar_t kChromeLauncherExeName[]; @@ -26,7 +26,7 @@ extern const wchar_t kChromeLauncherExeName[]; class ScopedChromeFrameRegistrar { public: ScopedChromeFrameRegistrar(); - ScopedChromeFrameRegistrar(const std::wstring& path); + explicit ScopedChromeFrameRegistrar(const std::wstring& path); virtual ~ScopedChromeFrameRegistrar(); void RegisterChromeFrameAtPath(const std::wstring& path); diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h index 8640f11..56d2460 100644 --- a/chrome_frame/utils.h +++ b/chrome_frame/utils.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,7 +13,6 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/histogram.h" #include "base/lock.h" #include "base/logging.h" @@ -21,6 +20,8 @@ #include "gfx/rect.h" #include "googleurl/src/gurl.h" +class FilePath; + // utils.h : Various utility functions and classes extern const wchar_t kChromeContentPrefix[]; diff --git a/net/base/cert_test_util.h b/net/base/cert_test_util.h index b800c23..45c8ed3 100644 --- a/net/base/cert_test_util.h +++ b/net/base/cert_test_util.h @@ -6,9 +6,10 @@ #define NET_BASE_CERT_TEST_UTIL_H_ #pragma once -#include "base/file_path.h" #include "build/build_config.h" +class FilePath; + namespace net { class X509Certificate; diff --git a/net/disk_cache/disk_cache_test_util.h b/net/disk_cache/disk_cache_test_util.h index f55905b..d639c67 100644 --- a/net/disk_cache/disk_cache_test_util.h +++ b/net/disk_cache/disk_cache_test_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,8 +14,6 @@ #include "base/timer.h" #include "build/build_config.h" -class FilePath; - // Re-creates a given test file inside the cache test folder. bool CreateCacheTestFile(const FilePath& name); @@ -42,7 +40,8 @@ bool CheckCacheIntegrity(const FilePath& path, bool new_eviction); class ScopedTestCache { public: ScopedTestCache(); - ScopedTestCache(const std::string& name); // Use a specific folder name. + // Use a specific folder name. + explicit ScopedTestCache(const std::string& name); ~ScopedTestCache(); FilePath path() const { return path_; } diff --git a/net/tools/dump_cache/url_to_filename_encoder.h b/net/tools/dump_cache/url_to_filename_encoder.h index 0646153..29ae8b8 100644 --- a/net/tools/dump_cache/url_to_filename_encoder.h +++ b/net/tools/dump_cache/url_to_filename_encoder.h @@ -76,14 +76,12 @@ // NOTE: we avoid using some classes here (like FilePath and GURL) because we // share this code with other projects externally. -#ifndef NET_TOOLS_DUMP_CACHE_URL_TO_FILE_ENCODER_H_ -#define NET_TOOLS_DUMP_CACHE_URL_TO_FILE_ENCODER_H_ +#ifndef NET_TOOLS_DUMP_CACHE_URL_TO_FILENAME_ENCODER_H_ +#define NET_TOOLS_DUMP_CACHE_URL_TO_FILENAME_ENCODER_H_ #pragma once #include <string> -#include "base/file_path.h" -#include "base/file_util.h" #include "base/string_util.h" #include "net/tools/dump_cache/url_utilities.h" @@ -211,4 +209,4 @@ class UrlToFilenameEncoder { } // namespace net -#endif // NET_TOOLS_DUMP_CACHE_URL_TO_FILE_ENCODER_H_ +#endif // NET_TOOLS_DUMP_CACHE_URL_TO_FILENAME_ENCODER_H_ diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h index e7c27cc..a05634f 100644 --- a/net/url_request/url_request_unittest.h +++ b/net/url_request/url_request_unittest.h @@ -12,8 +12,6 @@ #include <string> #include <vector> -#include "base/file_path.h" -#include "base/file_util.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/webkit/appcache/appcache_service.h b/webkit/appcache/appcache_service.h index 6ba04c8..413b25c 100644 --- a/webkit/appcache/appcache_service.h +++ b/webkit/appcache/appcache_service.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,6 @@ #include <set> #include <vector> -#include "base/file_path.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/time.h" @@ -18,6 +17,7 @@ #include "webkit/appcache/appcache_interfaces.h" #include "webkit/appcache/appcache_storage.h" +class FilePath; class URLRequestContext; namespace base { diff --git a/webkit/database/database_util.h b/webkit/database/database_util.h index ec5c1c2b..cecea79 100644 --- a/webkit/database/database_util.h +++ b/webkit/database/database_util.h @@ -5,10 +5,11 @@ #ifndef WEBKIT_DATABASE_DATABASE_UTIL_H_ #define WEBKIT_DATABASE_DATABASE_UTIL_H_ -#include "base/file_path.h" #include "base/string16.h" #include "googleurl/src/gurl.h" +class FilePath; + namespace webkit_database { class DatabaseTracker; diff --git a/webkit/glue/media/mock_media_resource_loader_bridge_factory.h b/webkit/glue/media/mock_media_resource_loader_bridge_factory.h index 7bb27fe..3c0a3ae 100644 --- a/webkit/glue/media/mock_media_resource_loader_bridge_factory.h +++ b/webkit/glue/media/mock_media_resource_loader_bridge_factory.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_ -#define WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_ +#ifndef WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_ +#define WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_ #include "testing/gmock/include/gmock/gmock.h" #include "webkit/glue/media/media_resource_loader_bridge_factory.h" @@ -33,4 +33,4 @@ class MockMediaResourceLoaderBridgeFactory } // namespace webkit_glue -#endif // WEBKIT_GLUE_MEDIA_MOCK_RESOURCE_LOADER_BRIDGE_H_ +#endif // WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_ diff --git a/webkit/glue/mock_resource_loader_bridge.h b/webkit/glue/mock_resource_loader_bridge.h index 0dd1c36..2f60393 100644 --- a/webkit/glue/mock_resource_loader_bridge.h +++ b/webkit/glue/mock_resource_loader_bridge.h @@ -1,14 +1,15 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_ -#define WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_ +#ifndef WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_ +#define WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_ -#include "base/file_path.h" #include "testing/gmock/include/gmock/gmock.h" #include "webkit/glue/resource_loader_bridge.h" +class FilePath; + namespace webkit_glue { class MockResourceLoaderBridge : public webkit_glue::ResourceLoaderBridge { @@ -39,4 +40,4 @@ class MockResourceLoaderBridge : public webkit_glue::ResourceLoaderBridge { } // namespace webkit_glue -#endif // WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_ +#endif // WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_ diff --git a/webkit/glue/plugins/pepper_plugin_module.h b/webkit/glue/plugins/pepper_plugin_module.h index 6bfeccf..f624110 100644 --- a/webkit/glue/plugins/pepper_plugin_module.h +++ b/webkit/glue/plugins/pepper_plugin_module.h @@ -8,12 +8,13 @@ #include <set> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/native_library.h" #include "base/ref_counted.h" #include "third_party/ppapi/c/pp_module.h" #include "third_party/ppapi/c/ppb.h" +class FilePath; + typedef struct _ppb_Core PPB_Core; namespace pepper { diff --git a/webkit/glue/plugins/pepper_webplugin_impl.cc b/webkit/glue/plugins/pepper_webplugin_impl.cc index df8aae0..68fdb88 100644 --- a/webkit/glue/plugins/pepper_webplugin_impl.cc +++ b/webkit/glue/plugins/pepper_webplugin_impl.cc @@ -4,7 +4,6 @@ #include "webkit/glue/plugins/pepper_webplugin_impl.h" -#include "base/file_path.h" #include "base/message_loop.h" #include "third_party/ppapi/c/pp_var.h" #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h" diff --git a/webkit/glue/plugins/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h index 647916e..ca46e41 100644 --- a/webkit/glue/plugins/plugin_lib.h +++ b/webkit/glue/plugins/plugin_lib.h @@ -9,13 +9,13 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/native_library.h" #include "base/ref_counted.h" #include "build/build_config.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/plugins/webplugin.h" +class FilePath; struct WebPluginInfo; namespace NPAPI { diff --git a/webkit/glue/plugins/plugin_stream.h b/webkit/glue/plugins/plugin_stream.h index f15ea66..c17faaf 100644 --- a/webkit/glue/plugins/plugin_stream.h +++ b/webkit/glue/plugins/plugin_stream.h @@ -2,13 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_H__ -#define WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_H__ +#ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_ +#define WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_ + +#include "build/build_config.h" #include <string> #include <vector> +#if defined(OS_POSIX) #include "base/file_path.h" +#endif #include "base/ref_counted.h" #include "third_party/npapi/bindings/npapi.h" @@ -110,7 +114,8 @@ class PluginStream : public base::RefCounted<PluginStream> { // Send the data to the plugin, returning how many bytes it accepted, or -1 // if an error occurred. - int TryWriteToPlugin(const char *buf, const int length, const int data_offset); + int TryWriteToPlugin(const char *buf, const int length, + const int data_offset); // The callback which calls TryWriteToPlugin. void OnDelayDelivery(); @@ -141,6 +146,6 @@ class PluginStream : public base::RefCounted<PluginStream> { DISALLOW_COPY_AND_ASSIGN(PluginStream); }; -} // namespace NPAPI +} // namespace NPAPI -#endif // WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_H__ +#endif // WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_ diff --git a/webkit/glue/plugins/webplugin_delegate_impl.h b/webkit/glue/plugins/webplugin_delegate_impl.h index 1c7ccb2..5fe4547 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl.h +++ b/webkit/glue/plugins/webplugin_delegate_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_PLUGIN_WEBPLUGIN_DELEGATE_IMPL_H_ -#define WEBKIT_GLUE_PLUGIN_WEBPLUGIN_DELEGATE_IMPL_H_ +#ifndef WEBKIT_GLUE_PLUGINS_WEBPLUGIN_DELEGATE_IMPL_H_ +#define WEBKIT_GLUE_PLUGINS_WEBPLUGIN_DELEGATE_IMPL_H_ #include "build/build_config.h" @@ -11,7 +11,6 @@ #include <list> #include <set> -#include "base/file_path.h" #include "base/ref_counted.h" #include "base/task.h" #include "base/time.h" @@ -32,6 +31,8 @@ typedef struct _GdkDrawable GdkPixmap; #endif +class FilePath; + namespace NPAPI { class PluginInstance; } @@ -297,7 +298,7 @@ class WebPluginDelegateImpl : public webkit_glue::WebPluginDelegate { // layout of this process with the one of the browser process. HKL keyboard_layout_; int parent_thread_id_; -#endif // OS_WIN +#endif // defined(OS_WIN) #if defined(USE_X11) // The SHM pixmap for a windowless plugin. @@ -498,4 +499,4 @@ class WebPluginDelegateImpl : public webkit_glue::WebPluginDelegate { DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateImpl); }; -#endif // WEBKIT_GLUE_PLUGIN_WEBPLUGIN_DELEGATE_IMPL_H_ +#endif // WEBKIT_GLUE_PLUGINS_WEBPLUGIN_DELEGATE_IMPL_H_ diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.h b/webkit/tools/test_shell/simple_resource_loader_bridge.h index 7bde640..aa6ebd4 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.h +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,9 +7,9 @@ #include <string> #include "base/message_loop_proxy.h" -#include "base/file_path.h" #include "net/http/http_cache.h" +class FilePath; class GURL; class TestShellRequestContext; |