diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-13 18:39:46 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-13 18:39:46 +0000 |
| commit | 7560500adc415736cf47cef3c151f605d0750c14 (patch) | |
| tree | 76d2078625749c1b6c445936971883b7fecdfd98 /webkit/tools/test_shell/test_navigation_controller.cc | |
| parent | b03b09278bdea7a21868403de2ab027ef8e5b19b (diff) | |
| download | chromium_src-7560500adc415736cf47cef3c151f605d0750c14.zip chromium_src-7560500adc415736cf47cef3c151f605d0750c14.tar.gz chromium_src-7560500adc415736cf47cef3c151f605d0750c14.tar.bz2 | |
Basic GTK test shell: links in the SConscript and brings up a window with nonfunctioning UI.
Review URL: http://codereview.chromium.org/2983
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3299 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_navigation_controller.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_navigation_controller.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_navigation_controller.cc b/webkit/tools/test_shell/test_navigation_controller.cc index 8ee20b5..0c56115 100644 --- a/webkit/tools/test_shell/test_navigation_controller.cc +++ b/webkit/tools/test_shell/test_navigation_controller.cc @@ -34,13 +34,16 @@ void TestNavigationEntry::SetContentState(const std::string& state) { } WebHistoryItem* TestNavigationEntry::GetHistoryItem() const { + // TODO(port): temporary hack to get a basic test shell executable going. +#if !defined(OS_LINUX) if (!cached_history_item_) { - TestShellExtraRequestData* extra_data = + TestShellExtraRequestData* extra_data = new TestShellExtraRequestData(GetPageID()); cached_history_item_ = WebHistoryItem::Create(GetURL(), GetTitle(), GetContentState(), extra_data); } +#endif return cached_history_item_; } @@ -244,4 +247,3 @@ void TestNavigationController::UpdateMaxPageID() { if (entry) max_page_id_ = std::max(max_page_id_, entry->GetPageID()); } - |