Commit e4d9c1fb authored by groby@chromium.org's avatar groby@chromium.org

Moved web_intent_service_data into webkit/glue

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7980063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102273 0039d316-1c4b-4281-b951-d872f2087c98
parent a2ddfc07
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/string16.h" #include "base/string16.h"
#include "chrome/browser/intents/web_intent_service_data.h"
#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
#include "webkit/glue/web_intent_service_data.h"
class Profile; class Profile;
class TabContents; class TabContents;
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include "chrome/browser/intents/register_intent_handler_infobar_delegate.h" #include "chrome/browser/intents/register_intent_handler_infobar_delegate.h"
#include "chrome/browser/intents/web_intents_registry.h" #include "chrome/browser/intents/web_intents_registry.h"
#include "chrome/browser/intents/web_intents_registry_factory.h" #include "chrome/browser/intents/web_intents_registry_factory.h"
#include "chrome/browser/intents/web_intent_service_data.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h" #include "content/browser/browser_thread.h"
...@@ -15,6 +14,7 @@ ...@@ -15,6 +14,7 @@
#include "content/browser/tab_contents/test_tab_contents.h" #include "content/browser/tab_contents/test_tab_contents.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/web_intent_service_data.h"
namespace { namespace {
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
#include "base/hash_tables.h" #include "base/hash_tables.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "chrome/browser/intents/web_intent_service_data.h"
#include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/profiles/profile_keyed_service.h"
#include "chrome/browser/webdata/web_data_service.h" #include "chrome/browser/webdata/web_data_service.h"
#include "webkit/glue/web_intent_service_data.h"
// Handles storing and retrieving of web intents in the web database. // Handles storing and retrieving of web intents in the web database.
// The registry provides filtering logic to retrieve specific types of intents. // The registry provides filtering logic to retrieve specific types of intents.
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <vector> #include <vector>
#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service.h"
#include "chrome/browser/intents/web_intent_service_data.h"
#include "chrome/browser/intents/web_intents_registry.h" #include "chrome/browser/intents/web_intents_registry.h"
#include "chrome/browser/intents/web_intents_registry_factory.h" #include "chrome/browser/intents/web_intents_registry_factory.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
...@@ -18,6 +17,7 @@ ...@@ -18,6 +17,7 @@
#include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents.h"
#include "content/common/notification_source.h" #include "content/common/notification_source.h"
#include "ui/gfx/codec/png_codec.h" #include "ui/gfx/codec/png_codec.h"
#include "webkit/glue/web_intent_service_data.h"
namespace { namespace {
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service.h"
#include "chrome/browser/intents/web_intent_service_data.h"
#include "chrome/browser/intents/web_intents_registry.h" #include "chrome/browser/intents/web_intents_registry.h"
#include "chrome/browser/intents/web_intents_registry_factory.h" #include "chrome/browser/intents/web_intents_registry_factory.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
...@@ -26,6 +25,7 @@ ...@@ -26,6 +25,7 @@
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "ui/gfx/codec/png_codec.h" #include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/native_widget_types.h" #include "ui/gfx/native_widget_types.h"
#include "webkit/glue/web_intent_service_data.h"
using testing::_; using testing::_;
using testing::AtMost; using testing::AtMost;
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/string16.h" #include "base/string16.h"
#include "chrome/browser/intents/web_intent_service_data.h"
#include "chrome/browser/webdata/web_database_table.h" #include "chrome/browser/webdata/web_database_table.h"
#include "webkit/glue/web_intent_service_data.h"
class GURL; class GURL;
......
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
#include "base/scoped_temp_dir.h" #include "base/scoped_temp_dir.h"
#include "base/string16.h" #include "base/string16.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "chrome/browser/intents/web_intent_service_data.h"
#include "chrome/browser/webdata/web_database.h" #include "chrome/browser/webdata/web_database.h"
#include "chrome/browser/webdata/web_intents_table.h" #include "chrome/browser/webdata/web_intents_table.h"
#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths.h"
#include "googleurl/src/gurl.h" #include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/web_intent_service_data.h"
namespace { namespace {
......
...@@ -1420,8 +1420,6 @@ ...@@ -1420,8 +1420,6 @@
'browser/intents/web_intents_registry.h', 'browser/intents/web_intents_registry.h',
'browser/intents/web_intents_registry_factory.cc', 'browser/intents/web_intents_registry_factory.cc',
'browser/intents/web_intents_registry_factory.h', 'browser/intents/web_intents_registry_factory.h',
'browser/intents/web_intent_service_data.cc',
'browser/intents/web_intent_service_data.h',
'browser/internal_auth.cc', 'browser/internal_auth.cc',
'browser/internal_auth.h', 'browser/internal_auth.h',
'browser/intranet_redirect_detector.cc', 'browser/intranet_redirect_detector.cc',
......
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "base/utf_string_conversions.h"
#include "chrome/browser/intents/web_intent_service_data.h"
#include <ostream> #include <ostream>
#include "base/utf_string_conversions.h"
#include "webkit/glue/web_intent_service_data.h"
WebIntentServiceData::WebIntentServiceData() WebIntentServiceData::WebIntentServiceData()
: disposition(WebIntentServiceData::DISPOSITION_WINDOW) { : disposition(WebIntentServiceData::DISPOSITION_WINDOW) {
} }
......
...@@ -397,6 +397,8 @@ ...@@ -397,6 +397,8 @@
'webdropdata.h', 'webdropdata.h',
'webfileutilities_impl.cc', 'webfileutilities_impl.cc',
'webfileutilities_impl.h', 'webfileutilities_impl.h',
'web_intent_service_data.cc',
'web_intent_service_data.h',
'webkit_constants.h', 'webkit_constants.h',
'webkit_glue.cc', 'webkit_glue.cc',
'webkit_glue.h', 'webkit_glue.h',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment