summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 07:37:22 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 07:37:22 +0000
commit11112477f709901f477c7a4f1afc81178a1dfa8d (patch)
treed6afcee74f5eedd0c7a26382056075803310f972 /webkit
parentc6f882173c881372f71cbe400ee4b6c4535afaaf (diff)
downloadchromium_src-11112477f709901f477c7a4f1afc81178a1dfa8d.zip
chromium_src-11112477f709901f477c7a4f1afc81178a1dfa8d.tar.gz
chromium_src-11112477f709901f477c7a4f1afc81178a1dfa8d.tar.bz2
Prepare for removing glue/devtools: move devtools_message_data.* to glue/
BUG=34411 Review URL: http://codereview.chromium.org/599005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/devtools_message_data.cc (renamed from webkit/glue/devtools/devtools_message_data.cc)10
-rw-r--r--webkit/glue/devtools_message_data.h (renamed from webkit/glue/devtools/devtools_message_data.h)4
-rw-r--r--webkit/webkit.gyp4
3 files changed, 8 insertions, 10 deletions
diff --git a/webkit/glue/devtools/devtools_message_data.cc b/webkit/glue/devtools_message_data.cc
index 12e2064..a9af3c5 100644
--- a/webkit/glue/devtools/devtools_message_data.cc
+++ b/webkit/glue/devtools_message_data.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 "webkit/glue/devtools/devtools_message_data.h"
+#include "webkit/glue/devtools_message_data.h"
#include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsMessageData.h"
@@ -12,15 +12,13 @@ using WebKit::WebString;
using WebKit::WebVector;
DevToolsMessageData::DevToolsMessageData(const WebDevToolsMessageData& data)
- : class_name(data.className.utf8())
- , method_name(data.methodName.utf8())
-{
+ : class_name(data.className.utf8()),
+ method_name(data.methodName.utf8()) {
for (size_t i = 0; i < data.arguments.size(); i++)
arguments.push_back(data.arguments[i].utf8());
}
-WebDevToolsMessageData DevToolsMessageData::ToWebDevToolsMessageData() const
-{
+WebDevToolsMessageData DevToolsMessageData::ToWebDevToolsMessageData() const {
WebDevToolsMessageData result;
result.className = WebString::fromUTF8(class_name);
result.methodName = WebString::fromUTF8(method_name);
diff --git a/webkit/glue/devtools/devtools_message_data.h b/webkit/glue/devtools_message_data.h
index 7fc7095..31daa14 100644
--- a/webkit/glue/devtools/devtools_message_data.h
+++ b/webkit/glue/devtools_message_data.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_DEVTOOLS_DEVTOOLS_MESSAGE_DATA_H_
-#define WEBKIT_GLUE_DEVTOOLS_DEVTOOLS_MESSAGE_DATA_H_
+#ifndef WEBKIT_GLUE_DEVTOOLS_MESSAGE_DATA_H_
+#define WEBKIT_GLUE_DEVTOOLS_MESSAGE_DATA_H_
#include <string>
#include <vector>
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 30f46ab..fbc5f8b 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -243,8 +243,8 @@
# This list contains all .h, .cc, and .mm files in glue except for
# those in the test subdirectory and those with unittest in in their
# names.
- 'glue/devtools/devtools_message_data.cc',
- 'glue/devtools/devtools_message_data.h',
+ 'glue/devtools_message_data.cc',
+ 'glue/devtools_message_data.h',
'glue/media/buffered_data_source.cc',
'glue/media/buffered_data_source.h',
'glue/media/media_resource_loader_bridge_factory.cc',