diff options
author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-15 22:58:59 +0000 |
---|---|---|
committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-15 22:58:59 +0000 |
commit | 137be686649791d3aa4467ff16af017ca19c6170 (patch) | |
tree | e71a8d1c41d9e07235843986e68da0d2c53fcfd3 /webkit/tools/test_shell/gtk | |
parent | 3216aa820e40c3a99374961546b0030da375a164 (diff) | |
download | chromium_src-137be686649791d3aa4467ff16af017ca19c6170.zip chromium_src-137be686649791d3aa4467ff16af017ca19c6170.tar.gz chromium_src-137be686649791d3aa4467ff16af017ca19c6170.tar.bz2 |
This is a very important change and it is past time we commit it.
Review URL: http://codereview.chromium.org/7377
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/gtk')
-rw-r--r-- | webkit/tools/test_shell/gtk/test_shell.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/gtk/test_shell.cc b/webkit/tools/test_shell/gtk/test_shell.cc index 13e8c1a..57fe689 100644 --- a/webkit/tools/test_shell/gtk/test_shell.cc +++ b/webkit/tools/test_shell/gtk/test_shell.cc @@ -6,6 +6,8 @@ #include <gtk/gtk.h> +#include "base/file_util.h" +#include "base/path_service.h" #include "base/string_util.h" #include "webkit/glue/webpreferences.h" #include "webkit/tools/test_shell/test_navigation_controller.h" @@ -75,6 +77,17 @@ bool TestShell::Initialize(const std::wstring& startingURL) { gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); + // 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); |