Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(819)

Side by Side Diff: webkit/tools/test_shell/test_webview_delegate_gtk.cc

Issue 12036003: Move window_open_disposition.h from webkit/ into ui/base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file was forked off the Mac port. 5 // This file was forked off the Mac port.
6 6
7 #include "webkit/tools/test_shell/test_webview_delegate.h" 7 #include "webkit/tools/test_shell/test_webview_delegate.h"
8 8
9 #include <gdk/gdkx.h>
9 #include <gtk/gtk.h> 10 #include <gtk/gtk.h>
10 #include <gdk/gdkx.h>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "net/base/net_errors.h" 15 #include "net/base/net_errors.h"
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
22 #include "ui/base/window_open_disposition.h"
22 #include "ui/gfx/gtk_util.h" 23 #include "ui/gfx/gtk_util.h"
23 #include "ui/gfx/point.h" 24 #include "ui/gfx/point.h"
24 #include "webkit/glue/webcursor.h" 25 #include "webkit/glue/webcursor.h"
25 #include "webkit/glue/webdropdata.h" 26 #include "webkit/glue/webdropdata.h"
26 #include "webkit/glue/webpreferences.h" 27 #include "webkit/glue/webpreferences.h"
27 #include "webkit/glue/window_open_disposition.h"
28 #include "webkit/plugins/npapi/gtk_plugin_container_manager.h" 28 #include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
29 #include "webkit/plugins/npapi/plugin_list.h" 29 #include "webkit/plugins/npapi/plugin_list.h"
30 #include "webkit/plugins/npapi/webplugin.h" 30 #include "webkit/plugins/npapi/webplugin.h"
31 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" 31 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
32 #include "webkit/tools/test_shell/test_navigation_controller.h" 32 #include "webkit/tools/test_shell/test_navigation_controller.h"
33 #include "webkit/tools/test_shell/test_shell.h" 33 #include "webkit/tools/test_shell/test_shell.h"
34 34
35 using WebKit::WebCursorInfo; 35 using WebKit::WebCursorInfo;
36 using WebKit::WebFrame; 36 using WebKit::WebFrame;
37 using WebKit::WebNavigationPolicy; 37 using WebKit::WebNavigationPolicy;
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 } 256 }
257 257
258 void TestWebViewDelegate::SetPageTitle(const string16& title) { 258 void TestWebViewDelegate::SetPageTitle(const string16& title) {
259 gtk_window_set_title(GTK_WINDOW(shell_->mainWnd()), 259 gtk_window_set_title(GTK_WINDOW(shell_->mainWnd()),
260 ("Test Shell - " + UTF16ToUTF8(title)).c_str()); 260 ("Test Shell - " + UTF16ToUTF8(title)).c_str());
261 } 261 }
262 262
263 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) { 263 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
264 gtk_entry_set_text(GTK_ENTRY(shell_->editWnd()), url.spec().c_str()); 264 gtk_entry_set_text(GTK_ENTRY(shell_->editWnd()), url.spec().c_str());
265 } 265 }
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_webview_delegate.cc ('k') | webkit/tools/test_shell/test_webview_delegate_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698