diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-09 11:47:42 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 14:33:03 +0100 |
| commit | dc0f95d653279beabeb9817299e2902918ba123e (patch) | |
| tree | 32eb121cd532053a5b9cb0c390331349af8d6baa /base/base.gypi | |
| parent | ba160cd4054d13d0cb0b1b46e61c3bed67095811 (diff) | |
| download | external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.zip external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.gz external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.bz2 | |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/base/base.gypi b/base/base.gypi index 7a5da2e..ef1d8d8 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -39,10 +39,12 @@ 'bind.h', 'bind_helpers.h', 'bind_internal.h', + 'bind_internal_win.h', 'bits.h', 'bzip2_error_handler.cc', 'callback.h', - 'callback_helpers.h', + 'callback_internal.cc', + 'callback_internal.h', 'callback_old.h', 'command_line.cc', 'command_line.h', @@ -249,8 +251,9 @@ 'task_queue.cc', 'task_queue.h', 'template_util.h', - 'threading/non_thread_safe.cc', 'threading/non_thread_safe.h', + 'threading/non_thread_safe_impl.cc', + 'threading/non_thread_safe_impl.h', 'threading/platform_thread.h', 'threading/platform_thread_mac.mm', 'threading/platform_thread_posix.cc', @@ -259,8 +262,9 @@ 'threading/simple_thread.h', 'threading/thread.cc', 'threading/thread.h', - 'threading/thread_checker.cc', 'threading/thread_checker.h', + 'threading/thread_checker_impl.cc', + 'threading/thread_checker_impl.h', 'threading/thread_collision_warner.cc', 'threading/thread_collision_warner.h', 'threading/thread_local.h', @@ -515,7 +519,6 @@ 'third_party/purify/pure_api.c', 'base_drag_source.cc', 'base_drop_target.cc', - 'cpu.cc', 'crypto/capi_util.h', 'crypto/capi_util.cc', 'event_recorder.cc', |