diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-29 18:07:56 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-29 18:07:56 +0000 |
| commit | c09b65412f771fecbbe24c6f7e6232c9edbe5022 (patch) | |
| tree | 7bebfa16d1b1fb280b952d122c1bccada8c916bd /webkit/tools/test_shell/gtk/test_shell.cc | |
| parent | 87221b1b14635992cbdeb95b6680fcacf626dfb4 (diff) | |
| download | chromium_src-c09b65412f771fecbbe24c6f7e6232c9edbe5022.zip chromium_src-c09b65412f771fecbbe24c6f7e6232c9edbe5022.tar.gz chromium_src-c09b65412f771fecbbe24c6f7e6232c9edbe5022.tar.bz2 | |
Start writing the GTK code for test_shell.
Review URL: http://codereview.chromium.org/8000
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/gtk/test_shell.cc')
| -rw-r--r-- | webkit/tools/test_shell/gtk/test_shell.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/webkit/tools/test_shell/gtk/test_shell.cc b/webkit/tools/test_shell/gtk/test_shell.cc index 8276220..97dc66c 100644 --- a/webkit/tools/test_shell/gtk/test_shell.cc +++ b/webkit/tools/test_shell/gtk/test_shell.cc @@ -20,9 +20,6 @@ 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() { @@ -79,17 +76,7 @@ bool TestShell::Initialize(const std::wstring& startingURL) { -1 /* append */); 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); + m_webViewHost.reset(WebViewHost::Create(vbox, NULL, *TestShell::web_prefs_)); gtk_container_add(GTK_CONTAINER(m_mainWnd), vbox); gtk_widget_show_all(m_mainWnd); |