From c5212894e576e713ffb90d43bc2e5de55478446e Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Wed, 8 Sep 2010 06:30:33 +0000 Subject: FBTF: Remove unneeded headers from base/ (part 8) BUG=none TEST=none Review URL: http://codereview.chromium.org/3232003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58794 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc | 1 - chrome/browser/autofill/autofill_type.cc | 3 +-- chrome/browser/chromeos/login/authenticator.h | 2 +- chrome/browser/chromeos/login/client_login_response_handler.h | 2 +- chrome/browser/chromeos/login/issue_response_handler.h | 2 +- chrome/browser/chromeos/login/oobe_progress_bar.h | 4 ++-- chrome/browser/chromeos/login/owner_key_utils_unittest.cc | 5 +---- .../browser/chromeos/tab_closeable_state_watcher_browsertest.cc | 4 +--- chrome/browser/cocoa/browser_window_factory.mm | 4 ++-- chrome/browser/cocoa/extensions/browser_actions_container_view.mm | 2 +- chrome/browser/cocoa/focus_tracker.mm | 4 ++-- chrome/browser/cocoa/notifications/balloon_view.mm | 2 +- chrome/browser/cocoa/rwhvm_editcommand_helper.h | 6 +++--- chrome/browser/cocoa/test_event_utils.h | 8 ++++---- chrome/browser/cocoa/url_drop_target.mm | 4 ++-- chrome/browser/cocoa/view_id_util_browsertest.mm | 2 +- chrome/browser/dock_info_mac.cc | 2 -- chrome/browser/dock_info_win.cc | 3 +-- chrome/browser/dom_ui/slideshow_ui.cc | 5 ++--- chrome/browser/download/download_exe.cc | 3 +-- chrome/browser/download/download_shelf.h | 1 - chrome/browser/extensions/extension_proxy_api.cc | 1 - chrome/browser/extensions/extension_test_message_listener.cc | 1 - chrome/browser/extensions/test_extension_prefs.cc | 1 - chrome/browser/google/google_update_settings_posix.cc | 3 +-- chrome/browser/gtk/bookmark_bar_gtk.cc | 1 - chrome/browser/gtk/focus_store_gtk.cc | 1 - chrome/browser/gtk/gtk_chrome_link_button.cc | 3 +-- chrome/browser/gtk/gtk_custom_menu_item.cc | 1 - chrome/browser/gtk/slide_animator_gtk.cc | 1 - chrome/browser/importer/firefox_proxy_settings.h | 2 +- chrome/browser/importer/nss_decryptor_mac.h | 1 - chrome/browser/in_process_webkit/indexed_db_callbacks.h | 6 ++---- chrome/browser/in_process_webkit/indexed_db_context.cc | 1 + chrome/browser/in_process_webkit/indexed_db_context.h | 1 - chrome/browser/in_process_webkit/webkit_thread.h | 2 +- chrome/browser/js_modal_dialog_win.cc | 2 -- chrome/browser/mock_browsing_data_appcache_helper.cc | 3 +-- chrome/browser/net/url_fixer_upper.cc | 2 ++ chrome/browser/parsers/metadata_parser_jpeg_factory.cc | 1 - chrome/browser/password_manager/ie7_password.cc | 3 +-- .../browser/policy/configuration_policy_provider_win_unittest.cc | 1 - chrome/browser/power_save_blocker_stub.cc | 4 +--- chrome/browser/process_singleton_linux_uitest.cc | 1 - chrome/browser/resources_util.cc | 7 +++---- chrome/browser/ssl/ssl_add_cert_handler_mac.mm | 1 + chrome/browser/sync/engine/net/server_connection_manager.h | 1 - chrome/browser/sync/engine/net/url_translator.cc | 3 +-- chrome/browser/sync/glue/history_model_worker.cc | 1 - chrome/browser/sync/glue/password_model_worker.cc | 1 - chrome/browser/sync/notifier/registration_manager_unittest.cc | 1 - chrome/browser/sync/profile_sync_factory_impl.cc | 2 -- chrome/browser/sync/util/crypto_helpers.h | 3 +-- chrome/browser/sync/util/data_encryption.cc | 4 +++- chrome/browser/sync/util/data_encryption.h | 3 +-- chrome/browser/sync/util/user_settings_win.cc | 3 ++- chrome/browser/tab_contents/tab_contents_view_gtk.cc | 1 - chrome/browser/tab_menu_model_unittest.cc | 7 +++---- chrome/browser/views/chrome_views_delegate.h | 3 ++- chrome/browser/views/frame/popup_non_client_frame_view.cc | 1 - chrome/browser/views/status_bubble_views.h | 4 ++-- chrome/browser/views/tabs/side_tab.cc | 1 - chrome/browser/wrench_menu_model_unittest.cc | 1 - chrome/common/child_process_logging_linux.cc | 1 - chrome/common/deprecated/event_sys_unittest.cc | 3 +-- chrome/common/gpu_info_unittest.cc | 3 +-- chrome/common/gpu_messages_unittest.cc | 3 +-- chrome/gpu/gpu_info_collector_win.cc | 1 - chrome/gpu/gpu_info_unittest_win.cc | 3 +-- chrome/installer/util/chrome_frame_distribution.cc | 3 +-- chrome/installer/util/copy_tree_work_item.cc | 4 +++- chrome/installer/util/create_dir_work_item.cc | 3 ++- chrome/installer/util/create_reg_key_work_item.cc | 5 +++-- chrome/installer/util/delete_reg_value_work_item.cc | 3 ++- chrome/installer/util/helper.cc | 3 ++- chrome/installer/util/logging_installer.h | 6 ++---- chrome/installer/util/move_tree_work_item.cc | 4 +++- chrome/installer/util/self_reg_work_item.cc | 3 ++- chrome/installer/util/set_reg_value_work_item.cc | 6 ++++-- chrome/installer/util/work_item_list.cc | 6 ++++-- chrome/renderer/audio_message_filter_unittest.cc | 1 - chrome/renderer/mock_printer.cc | 3 +-- chrome/renderer/renderer_histogram_snapshots.cc | 3 +-- chrome/test/webdriver/commands/command.h | 2 -- chrome/test/webdriver/commands/response.h | 2 +- chrome/worker/worker_webapplicationcachehost_impl.cc | 1 - 86 files changed, 94 insertions(+), 138 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc index 8ffb9cc..5ae42b7 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc @@ -5,7 +5,6 @@ #include #include "app/keyboard_codes.h" -#include "base/logging.h" #include "base/message_loop.h" #include "base/platform_thread.h" #include "base/ref_counted.h" diff --git a/chrome/browser/autofill/autofill_type.cc b/chrome/browser/autofill/autofill_type.cc index 030b12cb..2fd8cf2 100644 --- a/chrome/browser/autofill/autofill_type.cc +++ b/chrome/browser/autofill/autofill_type.cc @@ -1,11 +1,10 @@ -// 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/autofill/autofill_type.h" #include "base/basictypes.h" -#include "base/logging.h" namespace { diff --git a/chrome/browser/chromeos/login/authenticator.h b/chrome/browser/chromeos/login/authenticator.h index 823eee4..613b7fa 100644 --- a/chrome/browser/chromeos/login/authenticator.h +++ b/chrome/browser/chromeos/login/authenticator.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_AUTHENTICATOR_H_ #pragma once -#include "base/logging.h" +#include "base/basictypes.h" #include "base/ref_counted.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" diff --git a/chrome/browser/chromeos/login/client_login_response_handler.h b/chrome/browser/chromeos/login/client_login_response_handler.h index b788882..8fc1fe1 100644 --- a/chrome/browser/chromeos/login/client_login_response_handler.h +++ b/chrome/browser/chromeos/login/client_login_response_handler.h @@ -8,7 +8,7 @@ #include -#include "base/logging.h" +#include "base/basictypes.h" #include "chrome/browser/chromeos/login/auth_response_handler.h" class URLRequestContextGetter; diff --git a/chrome/browser/chromeos/login/issue_response_handler.h b/chrome/browser/chromeos/login/issue_response_handler.h index fa23030..e724111 100644 --- a/chrome/browser/chromeos/login/issue_response_handler.h +++ b/chrome/browser/chromeos/login/issue_response_handler.h @@ -8,7 +8,7 @@ #include -#include "base/logging.h" +#include "base/basictypes.h" #include "chrome/browser/chromeos/login/auth_response_handler.h" class URLRequestContextGetter; diff --git a/chrome/browser/chromeos/login/oobe_progress_bar.h b/chrome/browser/chromeos/login/oobe_progress_bar.h index da68db3..dd363ec 100644 --- a/chrome/browser/chromeos/login/oobe_progress_bar.h +++ b/chrome/browser/chromeos/login/oobe_progress_bar.h @@ -8,7 +8,7 @@ #include -#include "base/logging.h" +#include "base/basictypes.h" #include "gfx/font.h" #include "views/view.h" @@ -57,6 +57,6 @@ class OobeProgressBar : public views::View { DISALLOW_COPY_AND_ASSIGN(OobeProgressBar); }; -} // chromeos +} // namespace chromeos #endif // CHROME_BROWSER_CHROMEOS_LOGIN_OOBE_PROGRESS_BAR_H_ diff --git a/chrome/browser/chromeos/login/owner_key_utils_unittest.cc b/chrome/browser/chromeos/login/owner_key_utils_unittest.cc index 3a5255d..7a4d41b 100644 --- a/chrome/browser/chromeos/login/owner_key_utils_unittest.cc +++ b/chrome/browser/chromeos/login/owner_key_utils_unittest.cc @@ -10,7 +10,6 @@ #include "base/crypto/rsa_private_key.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/logging.h" #include "base/nss_util_internal.h" #include "base/nss_util.h" #include "base/ref_counted.h" @@ -22,9 +21,7 @@ namespace chromeos { class OwnerKeyUtilsTest : public ::testing::Test { public: - OwnerKeyUtilsTest() : utils_(OwnerKeyUtils::Create()) { - - } + OwnerKeyUtilsTest() : utils_(OwnerKeyUtils::Create()) {} virtual ~OwnerKeyUtilsTest() {} virtual void SetUp() { diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc b/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc index 444a1f9..deaa1ab 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc @@ -1,11 +1,10 @@ -// 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/tab_closeable_state_watcher.h" #include "base/file_path.h" -#include "base/logging.h" #include "chrome/browser/app_modal_dialog.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" @@ -317,4 +316,3 @@ IN_PROC_BROWSER_TEST_F(TabCloseableStateWatcherTest, } } // namespace chromeos - diff --git a/chrome/browser/cocoa/browser_window_factory.mm b/chrome/browser/cocoa/browser_window_factory.mm index ef83956..e655813 100644 --- a/chrome/browser/cocoa/browser_window_factory.mm +++ b/chrome/browser/cocoa/browser_window_factory.mm @@ -1,8 +1,8 @@ -// 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 "base/logging.h" +#include "base/basictypes.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/cocoa/browser_window_cocoa.h" diff --git a/chrome/browser/cocoa/extensions/browser_actions_container_view.mm b/chrome/browser/cocoa/extensions/browser_actions_container_view.mm index 56dbcec..e250fe6 100644 --- a/chrome/browser/cocoa/extensions/browser_actions_container_view.mm +++ b/chrome/browser/cocoa/extensions/browser_actions_container_view.mm @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/basictypes.h" #import "base/scoped_nsobject.h" #import "chrome/browser/cocoa/view_id_util.h" diff --git a/chrome/browser/cocoa/focus_tracker.mm b/chrome/browser/cocoa/focus_tracker.mm index ecbb864..86b612d 100644 --- a/chrome/browser/cocoa/focus_tracker.mm +++ b/chrome/browser/cocoa/focus_tracker.mm @@ -1,10 +1,10 @@ -// 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. #import "chrome/browser/cocoa/focus_tracker.h" -#include "base/logging.h" +#include "base/basictypes.h" @implementation FocusTracker diff --git a/chrome/browser/cocoa/notifications/balloon_view.mm b/chrome/browser/cocoa/notifications/balloon_view.mm index 940b8ab..3a5d13e 100644 --- a/chrome/browser/cocoa/notifications/balloon_view.mm +++ b/chrome/browser/cocoa/notifications/balloon_view.mm @@ -6,7 +6,7 @@ #import -#include "base/logging.h" +#include "base/basictypes.h" #include "base/scoped_nsobject.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" diff --git a/chrome/browser/cocoa/rwhvm_editcommand_helper.h b/chrome/browser/cocoa/rwhvm_editcommand_helper.h index a2828d3..706f8a0 100644 --- a/chrome/browser/cocoa/rwhvm_editcommand_helper.h +++ b/chrome/browser/cocoa/rwhvm_editcommand_helper.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,9 @@ #import +#include "base/basictypes.h" #include "base/hash_tables.h" #include "base/gtest_prod_util.h" -#include "base/logging.h" #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" // RenderWidgetHostViewMacEditCommandHelper is the real name of this class @@ -69,4 +69,4 @@ class RWHVMEditCommandHelper { DISALLOW_COPY_AND_ASSIGN(RWHVMEditCommandHelper); }; -#endif // CHROME_BROWSER_COCOA_RWHVM_EDITCOMMAND_HELPER_H_ +#endif // CHROME_BROWSER_COCOA_RWHVM_EDITCOMMAND_HELPER_H_ diff --git a/chrome/browser/cocoa/test_event_utils.h b/chrome/browser/cocoa/test_event_utils.h index 5eefd3f..aeda255 100644 --- a/chrome/browser/cocoa/test_event_utils.h +++ b/chrome/browser/cocoa/test_event_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. @@ -10,7 +10,7 @@ #import -#include "base/logging.h" +#include "base/basictypes.h" // Within a given scope, replace the selector |selector| on |target| with that // from |source|. @@ -40,8 +40,8 @@ NSEvent* LeftMouseDownAtPointInWindow(NSPoint point, NSWindow* window); // Return a mouse down and an up event with the given |clickCount| at // |view|'s midpoint. -std::pair MouseClickInView(NSView* view, - NSUInteger clickCount); +std::pair MouseClickInView(NSView* view, + NSUInteger clickCount); } // namespace test_event_utils diff --git a/chrome/browser/cocoa/url_drop_target.mm b/chrome/browser/cocoa/url_drop_target.mm index 8a97023..5c648b8 100644 --- a/chrome/browser/cocoa/url_drop_target.mm +++ b/chrome/browser/cocoa/url_drop_target.mm @@ -1,10 +1,10 @@ -// 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. #import "chrome/browser/cocoa/url_drop_target.h" -#include "base/logging.h" +#include "base/basictypes.h" #import "third_party/mozilla/NSPasteboard+Utils.h" @interface URLDropTargetHandler(Private) diff --git a/chrome/browser/cocoa/view_id_util_browsertest.mm b/chrome/browser/cocoa/view_id_util_browsertest.mm index 94e3aa4..e18ae03 100644 --- a/chrome/browser/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/cocoa/view_id_util_browsertest.mm @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/basictypes.h" #include "base/command_line.h" -#include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" diff --git a/chrome/browser/dock_info_mac.cc b/chrome/browser/dock_info_mac.cc index d67588d..7c4113c 100644 --- a/chrome/browser/dock_info_mac.cc +++ b/chrome/browser/dock_info_mac.cc @@ -4,8 +4,6 @@ #include "chrome/browser/dock_info.h" -#include "base/logging.h" - bool DockInfo::GetNewWindowBounds(gfx::Rect* new_window_bounds, bool* maximize_new_window) const { // TODO(pinkerton): Implement DockInfo, http://crbug.com/9274. diff --git a/chrome/browser/dock_info_win.cc b/chrome/browser/dock_info_win.cc index bdcbb59..cbeffcd 100644 --- a/chrome/browser/dock_info_win.cc +++ b/chrome/browser/dock_info_win.cc @@ -1,11 +1,10 @@ -// 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 "chrome/browser/dock_info.h" #include "base/basictypes.h" -#include "base/logging.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" diff --git a/chrome/browser/dom_ui/slideshow_ui.cc b/chrome/browser/dom_ui/slideshow_ui.cc index 1ec98fd..1e6543f 100644 --- a/chrome/browser/dom_ui/slideshow_ui.cc +++ b/chrome/browser/dom_ui/slideshow_ui.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. @@ -6,7 +6,6 @@ #include "app/resource_bundle.h" #include "base/callback.h" -#include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_piece.h" @@ -278,7 +277,7 @@ void SlideshowHandler::OnListDone(int error) { // //////////////////////////////////////////////////////////////////////////////// -SlideshowUI::SlideshowUI(TabContents* contents) : DOMUI(contents){ +SlideshowUI::SlideshowUI(TabContents* contents) : DOMUI(contents) { SlideshowHandler* handler = new SlideshowHandler(); AddMessageHandler((handler)->Attach(this)); handler->Init(); diff --git a/chrome/browser/download/download_exe.cc b/chrome/browser/download/download_exe.cc index c70b534..69ce1c5 100644 --- a/chrome/browser/download/download_exe.cc +++ b/chrome/browser/download/download_exe.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. @@ -7,7 +7,6 @@ #include "chrome/browser/download/download_util.h" -#include "base/logging.h" #include "base/string_util.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" diff --git a/chrome/browser/download/download_shelf.h b/chrome/browser/download/download_shelf.h index d952bab..b6ee780 100644 --- a/chrome/browser/download/download_shelf.h +++ b/chrome/browser/download/download_shelf.h @@ -8,7 +8,6 @@ #include "app/menus/simple_menu_model.h" #include "base/basictypes.h" -#include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string16.h" diff --git a/chrome/browser/extensions/extension_proxy_api.cc b/chrome/browser/extensions/extension_proxy_api.cc index 1e9ba78..7815385 100644 --- a/chrome/browser/extensions/extension_proxy_api.cc +++ b/chrome/browser/extensions/extension_proxy_api.cc @@ -4,7 +4,6 @@ #include "chrome/browser/extensions/extension_proxy_api.h" -#include "base/logging.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/extensions/extension_pref_store.h" diff --git a/chrome/browser/extensions/extension_test_message_listener.cc b/chrome/browser/extensions/extension_test_message_listener.cc index 3cf971b..bfa9db7 100644 --- a/chrome/browser/extensions/extension_test_message_listener.cc +++ b/chrome/browser/extensions/extension_test_message_listener.cc @@ -4,7 +4,6 @@ #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "base/logging.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index 6183d9d..5f4c94f 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -6,7 +6,6 @@ #include "base/file_util.h" -#include "base/logging.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/values.h" diff --git a/chrome/browser/google/google_update_settings_posix.cc b/chrome/browser/google/google_update_settings_posix.cc index 58be4b9..dbc6f1f 100644 --- a/chrome/browser/google/google_update_settings_posix.cc +++ b/chrome/browser/google/google_update_settings_posix.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. @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "base/file_util.h" -#include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index ee27bcf..4465aaa 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -8,7 +8,6 @@ #include "app/gtk_dnd_util.h" #include "app/resource_bundle.h" -#include "base/pickle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/gtk/focus_store_gtk.cc b/chrome/browser/gtk/focus_store_gtk.cc index 50ebfa7..e882e2b 100644 --- a/chrome/browser/gtk/focus_store_gtk.cc +++ b/chrome/browser/gtk/focus_store_gtk.cc @@ -6,7 +6,6 @@ #include -#include "base/logging.h" #include "chrome/browser/platform_util.h" FocusStoreGtk::FocusStoreGtk() diff --git a/chrome/browser/gtk/gtk_chrome_link_button.cc b/chrome/browser/gtk/gtk_chrome_link_button.cc index fea5822..6c94600 100644 --- a/chrome/browser/gtk/gtk_chrome_link_button.cc +++ b/chrome/browser/gtk/gtk_chrome_link_button.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. @@ -6,7 +6,6 @@ #include -#include "base/logging.h" #include "chrome/browser/gtk/gtk_util.h" static const gchar* kLinkMarkup = "%s"; diff --git a/chrome/browser/gtk/gtk_custom_menu_item.cc b/chrome/browser/gtk/gtk_custom_menu_item.cc index 206a1b7..55281c1 100644 --- a/chrome/browser/gtk/gtk_custom_menu_item.cc +++ b/chrome/browser/gtk/gtk_custom_menu_item.cc @@ -5,7 +5,6 @@ #include "chrome/browser/gtk/gtk_custom_menu_item.h" #include "base/i18n/rtl.h" -#include "base/logging.h" #include "chrome/browser/gtk/gtk_custom_menu.h" enum { diff --git a/chrome/browser/gtk/slide_animator_gtk.cc b/chrome/browser/gtk/slide_animator_gtk.cc index ff20c40..0534a7c 100644 --- a/chrome/browser/gtk/slide_animator_gtk.cc +++ b/chrome/browser/gtk/slide_animator_gtk.cc @@ -6,7 +6,6 @@ #include "app/animation.h" #include "app/slide_animation.h" -#include "base/logging.h" #include "chrome/browser/gtk/gtk_expanded_container.h" diff --git a/chrome/browser/importer/firefox_proxy_settings.h b/chrome/browser/importer/firefox_proxy_settings.h index 8495722..6ad3249 100644 --- a/chrome/browser/importer/firefox_proxy_settings.h +++ b/chrome/browser/importer/firefox_proxy_settings.h @@ -9,7 +9,7 @@ #include #include -#include "base/logging.h" +#include "base/basictypes.h" class FilePath; diff --git a/chrome/browser/importer/nss_decryptor_mac.h b/chrome/browser/importer/nss_decryptor_mac.h index 8d44a01..5e0eeff 100644 --- a/chrome/browser/importer/nss_decryptor_mac.h +++ b/chrome/browser/importer/nss_decryptor_mac.h @@ -10,7 +10,6 @@ #include #include "base/basictypes.h" -#include "base/logging.h" #include "base/string16.h" class FilePath; diff --git a/chrome/browser/in_process_webkit/indexed_db_callbacks.h b/chrome/browser/in_process_webkit/indexed_db_callbacks.h index 09a3bab..cc90dd8 100644 --- a/chrome/browser/in_process_webkit/indexed_db_callbacks.h +++ b/chrome/browser/in_process_webkit/indexed_db_callbacks.h @@ -7,7 +7,6 @@ #pragma once #include "base/basictypes.h" -#include "base/logging.h" #include "base/ref_counted.h" #include "chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h" #include "chrome/common/indexed_db_key.h" @@ -161,7 +160,7 @@ class IndexedDBCallbacks : public IndexedDBCallbacksBase { class IndexedDBTransactionCallbacks : public WebKit::WebIDBTransactionCallbacks { -public: + public: IndexedDBTransactionCallbacks( IndexedDBDispatcherHost* dispatcher_host, int transaction_id) : dispatcher_host_(dispatcher_host), transaction_id_(transaction_id) { @@ -176,10 +175,9 @@ public: return transaction_id_; } -private: + private: scoped_refptr dispatcher_host_; int transaction_id_; }; #endif // CHROME_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CALLBACKS_H_ - diff --git a/chrome/browser/in_process_webkit/indexed_db_context.cc b/chrome/browser/in_process_webkit/indexed_db_context.cc index ceaf8d9..6626c748 100644 --- a/chrome/browser/in_process_webkit/indexed_db_context.cc +++ b/chrome/browser/in_process_webkit/indexed_db_context.cc @@ -4,6 +4,7 @@ #include "chrome/browser/in_process_webkit/indexed_db_context.h" +#include "base/logging.h" #include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabase.h" #include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h" diff --git a/chrome/browser/in_process_webkit/indexed_db_context.h b/chrome/browser/in_process_webkit/indexed_db_context.h index cb3ce05..d75e75c 100644 --- a/chrome/browser/in_process_webkit/indexed_db_context.h +++ b/chrome/browser/in_process_webkit/indexed_db_context.h @@ -7,7 +7,6 @@ #pragma once #include "base/basictypes.h" -#include "base/logging.h" #include "base/scoped_ptr.h" namespace WebKit { diff --git a/chrome/browser/in_process_webkit/webkit_thread.h b/chrome/browser/in_process_webkit/webkit_thread.h index f09b79b..eeed43c 100644 --- a/chrome/browser/in_process_webkit/webkit_thread.h +++ b/chrome/browser/in_process_webkit/webkit_thread.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ #pragma once +#include "base/basictypes.h" #include "base/lock.h" -#include "base/logging.h" #include "base/scoped_ptr.h" #include "base/thread.h" #include "chrome/browser/chrome_thread.h" diff --git a/chrome/browser/js_modal_dialog_win.cc b/chrome/browser/js_modal_dialog_win.cc index 8bb2525..26cebc4 100644 --- a/chrome/browser/js_modal_dialog_win.cc +++ b/chrome/browser/js_modal_dialog_win.cc @@ -4,7 +4,6 @@ #include "chrome/browser/js_modal_dialog.h" -#include "base/logging.h" #include "chrome/browser/views/jsmessage_box_dialog.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "views/window/window.h" @@ -29,4 +28,3 @@ NativeDialog JavaScriptAppModalDialog::CreateNativeDialog() { return new JavaScriptMessageBoxDialog(this, message_text_, default_prompt_text_, display_suppress_checkbox_); } - diff --git a/chrome/browser/mock_browsing_data_appcache_helper.cc b/chrome/browser/mock_browsing_data_appcache_helper.cc index 97d2ec6..5fab6d0 100644 --- a/chrome/browser/mock_browsing_data_appcache_helper.cc +++ b/chrome/browser/mock_browsing_data_appcache_helper.cc @@ -1,11 +1,10 @@ -// 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/mock_browsing_data_appcache_helper.h" #include "base/callback.h" -#include "base/logging.h" MockBrowsingDataAppCacheHelper::MockBrowsingDataAppCacheHelper( Profile* profile) diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index ee8d00b..4b392df 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -6,7 +6,9 @@ #include +#if defined(OS_POSIX) #include "base/environment.h" +#endif #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc index 2eb47d2..5793984 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc +++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc @@ -5,7 +5,6 @@ #include "chrome/browser/parsers/metadata_parser_jpeg_factory.h" #include "base/file_path.h" -#include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/parsers/metadata_parser_jpeg.h" diff --git a/chrome/browser/password_manager/ie7_password.cc b/chrome/browser/password_manager/ie7_password.cc index 053bce9..d6945d81 100644 --- a/chrome/browser/password_manager/ie7_password.cc +++ b/chrome/browser/password_manager/ie7_password.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. @@ -8,7 +8,6 @@ #include #include -#include "base/logging.h" #include "base/scoped_ptr.h" #include "base/sha1.h" #include "base/string_util.h" diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc index 46ef118..aecb1ff 100644 --- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc @@ -6,7 +6,6 @@ #include -#include "base/logging.h" #include "base/registry.h" #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" diff --git a/chrome/browser/power_save_blocker_stub.cc b/chrome/browser/power_save_blocker_stub.cc index b1d695d..a509e63 100644 --- a/chrome/browser/power_save_blocker_stub.cc +++ b/chrome/browser/power_save_blocker_stub.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/power_save_blocker.h" -#include "base/logging.h" - // Default, stub implementation, for platforms that don't have their own yet. void PowerSaveBlocker::ApplyBlock(bool blocking) { diff --git a/chrome/browser/process_singleton_linux_uitest.cc b/chrome/browser/process_singleton_linux_uitest.cc index fc3fca0..f32eb1d 100644 --- a/chrome/browser/process_singleton_linux_uitest.cc +++ b/chrome/browser/process_singleton_linux_uitest.cc @@ -12,7 +12,6 @@ #include #include "base/eintr_wrapper.h" -#include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/thread.h" diff --git a/chrome/browser/resources_util.cc b/chrome/browser/resources_util.cc index aefc4e3..ab2fe9d 100644 --- a/chrome/browser/resources_util.cc +++ b/chrome/browser/resources_util.cc @@ -1,16 +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. #include "chrome/browser/resources_util.h" +#include + #include "base/hash_tables.h" #include "base/lazy_instance.h" -#include "base/logging.h" #include "grit/theme_resources_map.h" -#include - namespace { // A wrapper class that holds a hash_map between resource strings and resource diff --git a/chrome/browser/ssl/ssl_add_cert_handler_mac.mm b/chrome/browser/ssl/ssl_add_cert_handler_mac.mm index 75b8142..0f79a1c 100644 --- a/chrome/browser/ssl/ssl_add_cert_handler_mac.mm +++ b/chrome/browser/ssl/ssl_add_cert_handler_mac.mm @@ -8,6 +8,7 @@ #include #include "app/l10n_util_mac.h" +#include "base/logging.h" #include "base/scoped_nsobject.h" #include "chrome/common/logging_chrome.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/sync/engine/net/server_connection_manager.h b/chrome/browser/sync/engine/net/server_connection_manager.h index 602116a..23e2c26 100644 --- a/chrome/browser/sync/engine/net/server_connection_manager.h +++ b/chrome/browser/sync/engine/net/server_connection_manager.h @@ -11,7 +11,6 @@ #include "base/atomicops.h" #include "base/lock.h" -#include "base/logging.h" #include "base/string_util.h" #include "chrome/browser/sync/syncable/syncable_id.h" #include "chrome/common/deprecated/event_sys.h" diff --git a/chrome/browser/sync/engine/net/url_translator.cc b/chrome/browser/sync/engine/net/url_translator.cc index 6dc2754..4b91e54 100644 --- a/chrome/browser/sync/engine/net/url_translator.cc +++ b/chrome/browser/sync/engine/net/url_translator.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. // @@ -8,7 +8,6 @@ #include "chrome/browser/sync/engine/net/url_translator.h" #include "base/basictypes.h" -#include "base/logging.h" #include "base/port.h" #include "net/base/escape.h" diff --git a/chrome/browser/sync/glue/history_model_worker.cc b/chrome/browser/sync/glue/history_model_worker.cc index 1d4225e..8c0fdb4 100644 --- a/chrome/browser/sync/glue/history_model_worker.cc +++ b/chrome/browser/sync/glue/history_model_worker.cc @@ -4,7 +4,6 @@ #include "chrome/browser/sync/glue/history_model_worker.h" -#include "base/logging.h" #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/task.h" diff --git a/chrome/browser/sync/glue/password_model_worker.cc b/chrome/browser/sync/glue/password_model_worker.cc index 5e7669c..e09c2c5 100644 --- a/chrome/browser/sync/glue/password_model_worker.cc +++ b/chrome/browser/sync/glue/password_model_worker.cc @@ -5,7 +5,6 @@ #include "chrome/browser/sync/glue/password_model_worker.h" #include "base/callback.h" -#include "base/logging.h" #include "base/ref_counted.h" #include "base/task.h" #include "base/waitable_event.h" diff --git a/chrome/browser/sync/notifier/registration_manager_unittest.cc b/chrome/browser/sync/notifier/registration_manager_unittest.cc index 6d73afa..e8b9a85 100644 --- a/chrome/browser/sync/notifier/registration_manager_unittest.cc +++ b/chrome/browser/sync/notifier/registration_manager_unittest.cc @@ -9,7 +9,6 @@ #include #include "base/basictypes.h" -#include "base/logging.h" #include "chrome/browser/sync/notifier/invalidation_util.h" #include "chrome/browser/sync/syncable/model_type.h" #include "google/cacheinvalidation/invalidation-client.h" diff --git a/chrome/browser/sync/profile_sync_factory_impl.cc b/chrome/browser/sync/profile_sync_factory_impl.cc index a5df306..3b0b587 100644 --- a/chrome/browser/sync/profile_sync_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_factory_impl.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/logging.h" #include "chrome/browser/defaults.h" #include "chrome/browser/profile.h" #include "chrome/browser/sync/glue/app_data_type_controller.h" @@ -272,4 +271,3 @@ ProfileSyncFactoryImpl::CreateSessionSyncComponents( new SessionChangeProcessor(error_handler, model_associator); return SyncComponents(model_associator, change_processor); } - diff --git a/chrome/browser/sync/util/crypto_helpers.h b/chrome/browser/sync/util/crypto_helpers.h index 5caca42..5660447 100644 --- a/chrome/browser/sync/util/crypto_helpers.h +++ b/chrome/browser/sync/util/crypto_helpers.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,6 @@ // An object to handle calculation of MD5 sums. #include "base/basictypes.h" -#include "base/logging.h" #include "base/md5.h" #include "base/port.h" diff --git a/chrome/browser/sync/util/data_encryption.cc b/chrome/browser/sync/util/data_encryption.cc index 1232447..10f19ec 100644 --- a/chrome/browser/sync/util/data_encryption.cc +++ b/chrome/browser/sync/util/data_encryption.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. // @@ -13,6 +13,8 @@ #include #include +#include "base/logging.h" + using std::string; using std::vector; diff --git a/chrome/browser/sync/util/data_encryption.h b/chrome/browser/sync/util/data_encryption.h index 1fd0b19..1f48afd 100644 --- a/chrome/browser/sync/util/data_encryption.h +++ b/chrome/browser/sync/util/data_encryption.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,7 +10,6 @@ #include #include "base/basictypes.h" -#include "base/logging.h" using std::string; using std::vector; diff --git a/chrome/browser/sync/util/user_settings_win.cc b/chrome/browser/sync/util/user_settings_win.cc index 087fe6f..94090ac 100644 --- a/chrome/browser/sync/util/user_settings_win.cc +++ b/chrome/browser/sync/util/user_settings_win.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. @@ -6,6 +6,7 @@ #include +#include "base/logging.h" #include "chrome/browser/sync/util/crypto_helpers.h" #include "chrome/browser/sync/util/data_encryption.h" #include "chrome/common/sqlite_utils.h" diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc index 11a0da0..e3f5a65 100644 --- a/chrome/browser/tab_contents/tab_contents_view_gtk.cc +++ b/chrome/browser/tab_contents/tab_contents_view_gtk.cc @@ -8,7 +8,6 @@ #include #include -#include "base/pickle.h" #include "base/string_util.h" #include "build/build_config.h" #include "chrome/browser/download/download_shelf.h" diff --git a/chrome/browser/tab_menu_model_unittest.cc b/chrome/browser/tab_menu_model_unittest.cc index eaaa72e..fd39e57 100644 --- a/chrome/browser/tab_menu_model_unittest.cc +++ b/chrome/browser/tab_menu_model_unittest.cc @@ -1,10 +1,9 @@ -// 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. +// 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/tab_menu_model.h" -#include "base/logging.h" #include "chrome/test/menu_model_test.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/views/chrome_views_delegate.h b/chrome/browser/views/chrome_views_delegate.h index 2d14c9c..af046d2 100644 --- a/chrome/browser/views/chrome_views_delegate.h +++ b/chrome/browser/views/chrome_views_delegate.h @@ -6,7 +6,8 @@ #define CHROME_BROWSER_VIEWS_CHROME_VIEWS_DELEGATE_H_ #pragma once -#include "base/logging.h" +#include "base/basictypes.h" +#include "build/build_config.h" #include "views/views_delegate.h" class ChromeViewsDelegate : public views::ViewsDelegate { diff --git a/chrome/browser/views/frame/popup_non_client_frame_view.cc b/chrome/browser/views/frame/popup_non_client_frame_view.cc index d3b4d96..dd76c86 100644 --- a/chrome/browser/views/frame/popup_non_client_frame_view.cc +++ b/chrome/browser/views/frame/popup_non_client_frame_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/frame/popup_non_client_frame_view.h" -#include "base/logging.h" #include "chrome/browser/views/tabs/base_tab_strip.h" #include "gfx/point.h" #include "gfx/rect.h" diff --git a/chrome/browser/views/status_bubble_views.h b/chrome/browser/views/status_bubble_views.h index f5dbd12..85c1bb2 100644 --- a/chrome/browser/views/status_bubble_views.h +++ b/chrome/browser/views/status_bubble_views.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. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_VIEWS_STATUS_BUBBLE_VIEWS_H_ #pragma once -#include "base/logging.h" +#include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/task.h" diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc index 3959c06..a73bdee 100644 --- a/chrome/browser/views/tabs/side_tab.cc +++ b/chrome/browser/views/tabs/side_tab.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/tabs/side_tab.h" #include "app/resource_bundle.h" -#include "base/logging.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "gfx/favicon_size.h" diff --git a/chrome/browser/wrench_menu_model_unittest.cc b/chrome/browser/wrench_menu_model_unittest.cc index 9561158..c539cee 100644 --- a/chrome/browser/wrench_menu_model_unittest.cc +++ b/chrome/browser/wrench_menu_model_unittest.cc @@ -4,7 +4,6 @@ #include "chrome/browser/wrench_menu_model.h" -#include "base/logging.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/test/browser_with_test_window_test.h" #include "chrome/test/menu_model_test.h" diff --git a/chrome/common/child_process_logging_linux.cc b/chrome/common/child_process_logging_linux.cc index a6f21f5..e81fcc3 100644 --- a/chrome/common/child_process_logging_linux.cc +++ b/chrome/common/child_process_logging_linux.cc @@ -4,7 +4,6 @@ #include "chrome/common/child_process_logging.h" -#include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/gpu_info.h" diff --git a/chrome/common/deprecated/event_sys_unittest.cc b/chrome/common/deprecated/event_sys_unittest.cc index c70d3f7..2c55038 100644 --- a/chrome/common/deprecated/event_sys_unittest.cc +++ b/chrome/common/deprecated/event_sys_unittest.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. @@ -8,7 +8,6 @@ #include #include "base/basictypes.h" -#include "base/logging.h" #include "base/message_loop.h" #include "base/platform_thread.h" #include "base/port.h" diff --git a/chrome/common/gpu_info_unittest.cc b/chrome/common/gpu_info_unittest.cc index 4d469f6..a209aa9 100644 --- a/chrome/common/gpu_info_unittest.cc +++ b/chrome/common/gpu_info_unittest.cc @@ -1,8 +1,7 @@ -// 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. -#include "base/logging.h" #include "chrome/common/gpu_info.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/gpu_messages_unittest.cc b/chrome/common/gpu_messages_unittest.cc index 41a33ef..455458f 100644 --- a/chrome/common/gpu_messages_unittest.cc +++ b/chrome/common/gpu_messages_unittest.cc @@ -1,8 +1,7 @@ -// 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. -#include "base/logging.h" #include "base/scoped_ptr.h" #include "chrome/common/gpu_info.h" #include "chrome/common/gpu_messages.h" diff --git a/chrome/gpu/gpu_info_collector_win.cc b/chrome/gpu/gpu_info_collector_win.cc index 1ce5792..d741fe4 100644 --- a/chrome/gpu/gpu_info_collector_win.cc +++ b/chrome/gpu/gpu_info_collector_win.cc @@ -10,7 +10,6 @@ #include "app/gfx/gl/gl_context_egl.h" #include "app/gfx/gl/gl_implementation.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/gpu/gpu_info_unittest_win.cc b/chrome/gpu/gpu_info_unittest_win.cc index 5cf7af9..16a00cc 100644 --- a/chrome/gpu/gpu_info_unittest_win.cc +++ b/chrome/gpu/gpu_info_unittest_win.cc @@ -1,8 +1,7 @@ -// 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. -#include "base/logging.h" #include "base/scoped_ptr.h" #include "chrome/common/gpu_info.h" #include "chrome/gpu/gpu_idirect3d9_mock_win.h" diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc index 423731b..df07986 100644 --- a/chrome/installer/util/chrome_frame_distribution.cc +++ b/chrome/installer/util/chrome_frame_distribution.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. // @@ -12,7 +12,6 @@ #include #include -#include "base/logging.h" #include "base/string_util.h" #include "chrome/installer/util/l10n_string_util.h" #include "chrome/installer/util/google_update_constants.h" diff --git a/chrome/installer/util/copy_tree_work_item.cc b/chrome/installer/util/copy_tree_work_item.cc index 22007990..bf270e9 100644 --- a/chrome/installer/util/copy_tree_work_item.cc +++ b/chrome/installer/util/copy_tree_work_item.cc @@ -1,11 +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/installer/util/copy_tree_work_item.h" #include + #include "base/file_util.h" +#include "base/logging.h" #include "chrome/installer/util/logging_installer.h" CopyTreeWorkItem::~CopyTreeWorkItem() { diff --git a/chrome/installer/util/create_dir_work_item.cc b/chrome/installer/util/create_dir_work_item.cc index 3cfd1fb..ad19b8e 100644 --- a/chrome/installer/util/create_dir_work_item.cc +++ b/chrome/installer/util/create_dir_work_item.cc @@ -1,8 +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 "base/file_util.h" +#include "base/logging.h" #include "chrome/installer/util/create_dir_work_item.h" #include "chrome/installer/util/logging_installer.h" diff --git a/chrome/installer/util/create_reg_key_work_item.cc b/chrome/installer/util/create_reg_key_work_item.cc index c77092f..4c1eb2c 100644 --- a/chrome/installer/util/create_reg_key_work_item.cc +++ b/chrome/installer/util/create_reg_key_work_item.cc @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "shlwapi.h" +#include #include "base/file_util.h" +#include "base/logging.h" #include "base/registry.h" #include "chrome/installer/util/create_reg_key_work_item.h" #include "chrome/installer/util/install_util.h" @@ -24,7 +25,7 @@ void UpOneDirectoryOrEmpty(std::wstring* dir) { *dir = directory.ToWStringHack(); } -} // namespace +} // namespace CreateRegKeyWorkItem::~CreateRegKeyWorkItem() { } diff --git a/chrome/installer/util/delete_reg_value_work_item.cc b/chrome/installer/util/delete_reg_value_work_item.cc index 956eb74..7246d52 100644 --- a/chrome/installer/util/delete_reg_value_work_item.cc +++ b/chrome/installer/util/delete_reg_value_work_item.cc @@ -1,9 +1,10 @@ -// 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/installer/util/delete_reg_value_work_item.h" +#include "base/logging.h" #include "base/registry.h" #include "chrome/installer/util/logging_installer.h" diff --git a/chrome/installer/util/helper.cc b/chrome/installer/util/helper.cc index af18e9e..9c0dda9 100644 --- a/chrome/installer/util/helper.cc +++ b/chrome/installer/util/helper.cc @@ -1,10 +1,11 @@ -// 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 #include "base/file_util.h" +#include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/scoped_ptr.h" diff --git a/chrome/installer/util/logging_installer.h b/chrome/installer/util/logging_installer.h index 163f315..922de72 100644 --- a/chrome/installer/util/logging_installer.h +++ b/chrome/installer/util/logging_installer.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. @@ -6,8 +6,6 @@ #define CHROME_INSTALLER_UTIL_LOGGING_INSTALLER_H_ #pragma once -#include "base/logging.h" - class CommandLine; class FilePath; @@ -22,6 +20,6 @@ void EndInstallerLogging(); // Returns the full path of the log file. FilePath GetLogFilePath(const CommandLine& command_line); -} // namespace installer +} // namespace installer #endif // CHROME_INSTALLER_UTIL_LOGGING_INSTALLER_H_ diff --git a/chrome/installer/util/move_tree_work_item.cc b/chrome/installer/util/move_tree_work_item.cc index 45c03b2..02c25d5 100644 --- a/chrome/installer/util/move_tree_work_item.cc +++ b/chrome/installer/util/move_tree_work_item.cc @@ -1,11 +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/installer/util/move_tree_work_item.h" #include + #include "base/file_util.h" +#include "base/logging.h" #include "chrome/installer/util/logging_installer.h" MoveTreeWorkItem::~MoveTreeWorkItem() { diff --git a/chrome/installer/util/self_reg_work_item.cc b/chrome/installer/util/self_reg_work_item.cc index 93d5368..6cffdef 100644 --- a/chrome/installer/util/self_reg_work_item.cc +++ b/chrome/installer/util/self_reg_work_item.cc @@ -1,9 +1,10 @@ -// 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 "chrome/installer/util/self_reg_work_item.h" +#include "base/logging.h" #include "chrome/installer/util/logging_installer.h" // Default registration export names. diff --git a/chrome/installer/util/set_reg_value_work_item.cc b/chrome/installer/util/set_reg_value_work_item.cc index 74c8d2c..0cf9129 100644 --- a/chrome/installer/util/set_reg_value_work_item.cc +++ b/chrome/installer/util/set_reg_value_work_item.cc @@ -1,9 +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 "base/registry.h" #include "chrome/installer/util/set_reg_value_work_item.h" + +#include "base/logging.h" +#include "base/registry.h" #include "chrome/installer/util/logging_installer.h" SetRegValueWorkItem::~SetRegValueWorkItem() { diff --git a/chrome/installer/util/work_item_list.cc b/chrome/installer/util/work_item_list.cc index ce3437d..35b4590 100644 --- a/chrome/installer/util/work_item_list.cc +++ b/chrome/installer/util/work_item_list.cc @@ -1,10 +1,12 @@ -// 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/installer/util/logging_installer.h" #include "chrome/installer/util/work_item_list.h" +#include "base/logging.h" +#include "chrome/installer/util/logging_installer.h" + WorkItemList::~WorkItemList() { for (WorkItemIterator itr = list_.begin(); itr != list_.end(); ++itr) { delete (*itr); diff --git a/chrome/renderer/audio_message_filter_unittest.cc b/chrome/renderer/audio_message_filter_unittest.cc index ae3ec20..6c1e200 100644 --- a/chrome/renderer/audio_message_filter_unittest.cc +++ b/chrome/renderer/audio_message_filter_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/logging.h" #include "base/message_loop.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" diff --git a/chrome/renderer/mock_printer.cc b/chrome/renderer/mock_printer.cc index 6306172..728acb0 100644 --- a/chrome/renderer/mock_printer.cc +++ b/chrome/renderer/mock_printer.cc @@ -1,11 +1,10 @@ -// 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/renderer/mock_printer.h" #include "base/file_util.h" -#include "base/logging.h" #include "base/shared_memory.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" diff --git a/chrome/renderer/renderer_histogram_snapshots.cc b/chrome/renderer/renderer_histogram_snapshots.cc index cd0206d..5246141 100644 --- a/chrome/renderer/renderer_histogram_snapshots.cc +++ b/chrome/renderer/renderer_histogram_snapshots.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. @@ -9,7 +9,6 @@ #include "base/histogram.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/pickle.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_process.h" #include "chrome/renderer/render_thread.h" diff --git a/chrome/test/webdriver/commands/command.h b/chrome/test/webdriver/commands/command.h index b7057b7..11674fb3 100644 --- a/chrome/test/webdriver/commands/command.h +++ b/chrome/test/webdriver/commands/command.h @@ -9,7 +9,6 @@ #include #include "base/basictypes.h" -#include "base/logging.h" #include "base/scoped_ptr.h" #include "base/values.h" #include "base/json/json_writer.h" @@ -68,4 +67,3 @@ class Command { }; } // namespace webdriver #endif // CHROME_TEST_WEBDRIVER_COMMANDS_COMMAND_H_ - diff --git a/chrome/test/webdriver/commands/response.h b/chrome/test/webdriver/commands/response.h index aa67f8b..cfe6a08 100644 --- a/chrome/test/webdriver/commands/response.h +++ b/chrome/test/webdriver/commands/response.h @@ -8,6 +8,7 @@ #include #include "base/basictypes.h" +#include "base/logging.h" #include "base/values.h" #include "chrome/test/webdriver/error_codes.h" @@ -73,4 +74,3 @@ class Response { }; } // namespace webdriver #endif // CHROME_TEST_WEBDRIVER_COMMANDS_RESPONSE_H_ - diff --git a/chrome/worker/worker_webapplicationcachehost_impl.cc b/chrome/worker/worker_webapplicationcachehost_impl.cc index dafa1ea..2bf718a 100644 --- a/chrome/worker/worker_webapplicationcachehost_impl.cc +++ b/chrome/worker/worker_webapplicationcachehost_impl.cc @@ -4,7 +4,6 @@ #include "chrome/worker/worker_webapplicationcachehost_impl.h" -#include "base/logging.h" #include "chrome/common/appcache/appcache_dispatcher.h" #include "chrome/worker/worker_thread.h" -- cgit v1.1