diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 05:23:13 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 05:23:13 +0000 |
| commit | b7243c40f2c0e4742843d56d0a46c3d5ba2008d1 (patch) | |
| tree | f3ba1cec0461cab175f637deab6a837cfbb4d105 /chrome | |
| parent | 87a03a05c9dd5b2bf5fcf916526361f5c33b71de (diff) | |
| download | chromium_src-b7243c40f2c0e4742843d56d0a46c3d5ba2008d1.zip chromium_src-b7243c40f2c0e4742843d56d0a46c3d5ba2008d1.tar.gz chromium_src-b7243c40f2c0e4742843d56d0a46c3d5ba2008d1.tar.bz2 | |
Random bits of header and whitespace cleanup.
BUG=none
TEST=noe
Review URL: http://codereview.chromium.org/3062003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/tab_contents/tab_contents_drag_win.cc | 4 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 10 | ||||
| -rw-r--r-- | chrome/common/child_process.cc | 9 |
3 files changed, 14 insertions, 9 deletions
diff --git a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc index d52134a..c2050e5 100644 --- a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/views/tab_contents/tab_contents_drag_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,8 @@ #include <windows.h> +#include <string> + #include "base/file_path.h" #include "base/message_loop.h" #include "base/task.h" diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index f697f29..ec79c96 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -540,11 +540,11 @@ }, }, }, - }], + }], ['OS=="mac"', { 'dependencies': [ 'nacl_security_tests', # run time dependency - ], + ], }], ], }, @@ -901,7 +901,7 @@ 'browser/configuration_policy_provider_win_unittest.cc', 'browser/cookies_tree_model_unittest.cc', 'browser/debugger/devtools_manager_unittest.cc', - 'browser/dock_info_unittest.cc', + 'browser/dock_info_unittest.cc', 'browser/dom_ui/dom_ui_theme_source_unittest.cc', 'browser/dom_ui/dom_ui_unittest.cc', 'browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc', @@ -1135,7 +1135,7 @@ 'common/bzip2_unittest.cc', 'common/child_process_logging_mac_unittest.mm', 'common/common_param_traits_unittest.cc', - 'common/content_settings_helper_unittest.cc', + 'common/content_settings_helper_unittest.cc', 'common/deprecated/event_sys_unittest.cc', 'common/desktop_notifications/active_notification_tracker_unittest.cc', 'common/extensions/extension_action_unittest.cc', @@ -1309,7 +1309,7 @@ 'sources!': [ # Blocked on bookmark manager. 'browser/bookmarks/bookmark_context_menu_controller_unittest.cc', - 'browser/dock_info_unittest.cc', + 'browser/dock_info_unittest.cc', 'browser/gtk/reload_button_gtk_unittest.cc', 'browser/password_manager/password_store_default_unittest.cc', 'tools/convert_dict/convert_dict_unittest.cc', diff --git a/chrome/common/child_process.cc b/chrome/common/child_process.cc index 328ca14..71d025a 100644 --- a/chrome/common/child_process.cc +++ b/chrome/common/child_process.cc @@ -1,19 +1,22 @@ -// 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/common/child_process.h" +#if defined(OS_POSIX) +#include <signal.h> // For SigUSR1Handler below. +#endif + #include "app/l10n_util.h" #include "base/message_loop.h" #include "base/process_util.h" #include "base/string_util.h" +#include "base/thread.h" #include "chrome/common/child_thread.h" #include "grit/chromium_strings.h" #if defined(OS_POSIX) -#include <signal.h> - static void SigUSR1Handler(int signal) { } #endif |