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

Unified Diff: webkit/tools/test_shell/gtk/test_shell.cc

Issue 8839: * Revert "Start writing the GTK code for test_shell." (Closed)
Patch Set: Created 12 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/SConscript ('k') | webkit/tools/test_shell/gtk/webview_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/gtk/test_shell.cc
diff --git a/webkit/tools/test_shell/gtk/test_shell.cc b/webkit/tools/test_shell/gtk/test_shell.cc
index 97dc66cc0fb8911755c25214305ced50ac2a500a..827622083708fa2388f1d59fd9b3d4b365e48715 100644
--- a/webkit/tools/test_shell/gtk/test_shell.cc
+++ b/webkit/tools/test_shell/gtk/test_shell.cc
@@ -20,6 +20,9 @@ WebPreferences* TestShell::web_prefs_ = NULL;
WindowList* TestShell::window_list_;
TestShell::TestShell() {
+ // Uncomment this line to get a bunch of linker errors. This is what we need
+ // to fix.
+ m_webViewHost.reset(WebViewHost::Create(NULL, NULL, *TestShell::web_prefs_));
}
TestShell::~TestShell() {
@@ -76,7 +79,17 @@ bool TestShell::Initialize(const std::wstring& startingURL) {
-1 /* append */);
gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
- m_webViewHost.reset(WebViewHost::Create(vbox, NULL, *TestShell::web_prefs_));
+
+ // It's funny, ok?
+ std::wstring path;
+ PathService::Get(base::DIR_SOURCE_ROOT, &path);
+ file_util::AppendToPath(&path, L"webkit");
+ file_util::AppendToPath(&path, L"tools");
+ file_util::AppendToPath(&path, L"test_shell");
+ file_util::AppendToPath(&path, L"resources");
+ file_util::AppendToPath(&path, L"acid3.png");
+ GtkWidget* image = gtk_image_new_from_file(WideToUTF8(path).c_str());
+ gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(m_mainWnd), vbox);
gtk_widget_show_all(m_mainWnd);
« no previous file with comments | « webkit/glue/SConscript ('k') | webkit/tools/test_shell/gtk/webview_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698