diff options
| -rw-r--r-- | chrome/chrome.gyp | 4 | ||||
| -rw-r--r-- | chrome/renderer/loadtimes_extension_bindings.cc (renamed from chrome/renderer/extensions/loadtimes_extension_bindings.cc) | 2 | ||||
| -rw-r--r-- | chrome/renderer/loadtimes_extension_bindings.h (renamed from chrome/renderer/extensions/loadtimes_extension_bindings.h) | 0 | ||||
| -rw-r--r-- | chrome/renderer/render_thread.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/renderer.vcproj | 16 |
5 files changed, 12 insertions, 12 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index eb4f0c0..1f3de10 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1408,10 +1408,10 @@ 'renderer/automation/dom_automation_controller.h', 'renderer/extensions/extension_process_bindings.cc', 'renderer/extensions/extension_process_bindings.h', - 'renderer/extensions/loadtimes_extension_bindings.h', - 'renderer/extensions/loadtimes_extension_bindings.cc', 'renderer/extensions/renderer_extension_bindings.cc', 'renderer/extensions/renderer_extension_bindings.h', + 'renderer/loadtimes_extension_bindings.h', + 'renderer/loadtimes_extension_bindings.cc', 'renderer/media/audio_renderer_impl.cc', 'renderer/media/audio_renderer_impl.h', 'renderer/media/data_source_impl.cc', diff --git a/chrome/renderer/extensions/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc index b0836036..15342a9 100644 --- a/chrome/renderer/extensions/loadtimes_extension_bindings.cc +++ b/chrome/renderer/loadtimes_extension_bindings.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/extensions/loadtimes_extension_bindings.h" +#include "chrome/renderer/loadtimes_extension_bindings.h" #include "base/time.h" #include "v8/include/v8.h" diff --git a/chrome/renderer/extensions/loadtimes_extension_bindings.h b/chrome/renderer/loadtimes_extension_bindings.h index 4a6bcf5..4a6bcf5 100644 --- a/chrome/renderer/extensions/loadtimes_extension_bindings.h +++ b/chrome/renderer/loadtimes_extension_bindings.h diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 330c754..0b3c171 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -26,8 +26,8 @@ #include "webkit/glue/weburlrequest.h" #endif #include "chrome/renderer/extensions/extension_process_bindings.h" -#include "chrome/renderer/extensions/loadtimes_extension_bindings.h" #include "chrome/renderer/extensions/renderer_extension_bindings.h" +#include "chrome/renderer/loadtimes_extension_bindings.h" #include "chrome/renderer/net/render_dns_master.h" #include "chrome/renderer/render_process.h" #include "chrome/renderer/render_view.h" diff --git a/chrome/renderer/renderer.vcproj b/chrome/renderer/renderer.vcproj index e5e1092..d9ee179 100644 --- a/chrome/renderer/renderer.vcproj +++ b/chrome/renderer/renderer.vcproj @@ -193,14 +193,6 @@ > </File> <File - RelativePath=".\extensions\loadtimes_extension_bindings.cc" - > - </File> - <File - RelativePath=".\extensions\loadtimes_extension_bindings.h" - > - </File> - <File RelativePath=".\extensions\renderer_extension_bindings.cc" > </File> @@ -274,6 +266,14 @@ > </File> <File + RelativePath=".\loadtimes_extension_bindings.cc" + > + </File> + <File + RelativePath=".\loadtimes_extension_bindings.h" + > + </File> + <File RelativePath=".\localized_error.cc" > </File> |