diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 20:50:33 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 20:50:33 +0000 |
commit | f47621b16b748a2cb828e2f28b39f717c48ab65d (patch) | |
tree | 45c6d393814eb5ebfcaecab75bb814f228fb6fa0 /webkit/tools | |
parent | 801ae92b68cccbae5ee9b63a392217ae88fb5ba6 (diff) | |
download | chromium_src-f47621b16b748a2cb828e2f28b39f717c48ab65d.zip chromium_src-f47621b16b748a2cb828e2f28b39f717c48ab65d.tar.gz chromium_src-f47621b16b748a2cb828e2f28b39f717c48ab65d.tar.bz2 |
Move window_open_disposition.h from webkit/ into ui/base.
This reduces one more dependency on webkit from chrome.
BUG=146251
R=jam@chromium.org,ben@chromium.org
TBR=darin@chromium.org,tsepez@chromium.org
Review URL: https://codereview.chromium.org/12036003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_test.h | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 10 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate_gtk.cc | 4 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate_win.cc | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index baccf0b..5bebaad 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -29,11 +29,11 @@ #include "net/url_request/url_request_context.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" +#include "ui/base/window_open_disposition.h" #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_switches.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/window_open_disposition.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/test_shell_platform_delegate.h" diff --git a/webkit/tools/test_shell/test_shell_test.h b/webkit/tools/test_shell/test_shell_test.h index b0a9e35..3e2e354 100644 --- a/webkit/tools/test_shell/test_shell_test.h +++ b/webkit/tools/test_shell/test_shell_test.h @@ -14,7 +14,7 @@ #include "base/file_path.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/glue/window_open_disposition.h" +#include "ui/base/window_open_disposition.h" #include "webkit/tools/test_shell/test_shell.h" class TestShellTest : public testing::Test { diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 1ec2980..e946255 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -12,9 +12,9 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/process_util.h" +#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "media/base/filter_collection.h" #include "media/base/media_log.h" @@ -34,14 +34,14 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationClientMock.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationClientMock.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClientMock.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" @@ -52,6 +52,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" +#include "ui/base/window_open_disposition.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" #include "webkit/appcache/web_application_cache_host_impl.h" @@ -60,13 +61,12 @@ #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/weburlrequest_extradata_impl.h" -#include "webkit/glue/window_open_disposition.h" #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" #include "webkit/media/webmediaplayer_impl.h" #include "webkit/media/webmediaplayer_params.h" -#include "webkit/plugins/npapi/webplugin_impl.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugin_delegate_impl.h" +#include "webkit/plugins/npapi/webplugin_impl.h" #include "webkit/tools/test_shell/mock_spellcheck.h" #include "webkit/tools/test_shell/notification_presenter.h" #include "webkit/tools/test_shell/simple_appcache_system.h" diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc index 61d6559..8141b1c 100644 --- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc +++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc @@ -6,8 +6,8 @@ #include "webkit/tools/test_shell/test_webview_delegate.h" -#include <gtk/gtk.h> #include <gdk/gdkx.h> +#include <gtk/gtk.h> #include "base/bind.h" #include "base/message_loop.h" @@ -19,12 +19,12 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/window_open_disposition.h" #include "ui/gfx/gtk_util.h" #include "ui/gfx/point.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/window_open_disposition.h" #include "webkit/plugins/npapi/gtk_plugin_container_manager.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugin.h" diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc index bbaec7f..f9ea1a7 100644 --- a/webkit/tools/test_shell/test_webview_delegate_win.cc +++ b/webkit/tools/test_shell/test_webview_delegate_win.cc @@ -20,15 +20,15 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/window_open_disposition.h" #include "ui/gfx/gdi_util.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" #include "webkit/glue/webdropdata.h" -#include "webkit/glue/webpreferences.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/window_open_disposition.h" -#include "webkit/plugins/npapi/webplugin.h" +#include "webkit/glue/webpreferences.h" #include "webkit/plugins/npapi/plugin_list.h" +#include "webkit/plugins/npapi/webplugin.h" #include "webkit/plugins/npapi/webplugin_delegate_impl.h" #include "webkit/tools/test_shell/drop_delegate.h" #include "webkit/tools/test_shell/test_navigation_controller.h" |