diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 20:20:31 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 20:20:31 +0000 |
| commit | f7d8f971d839891709d1173ed1b11738c7235cbf (patch) | |
| tree | ac2ca877f6eaa4cea6ff43f1263f5079bbf467dc /chrome | |
| parent | 43c0748ef6398de7c3ee1ea1a7915709047e3907 (diff) | |
| download | chromium_src-f7d8f971d839891709d1173ed1b11738c7235cbf.zip chromium_src-f7d8f971d839891709d1173ed1b11738c7235cbf.tar.gz chromium_src-f7d8f971d839891709d1173ed1b11738c7235cbf.tar.bz2 | |
Fix linux ui tests broken by r15112.
also re-enable tests that I disabled in an attempt to green the bot
TBR=tony
Review URL: http://codereview.chromium.org/100351
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15234 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/tab_contents_container_gtk.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/chrome/browser/gtk/tab_contents_container_gtk.cc b/chrome/browser/gtk/tab_contents_container_gtk.cc index 4b9767b..4c1114f 100644 --- a/chrome/browser/gtk/tab_contents_container_gtk.cc +++ b/chrome/browser/gtk/tab_contents_container_gtk.cc @@ -48,10 +48,14 @@ void TabContentsContainerGtk::SetTabContents(TabContents* tab_contents) { gtk_widget_show_all(widget); } // We need to make sure that we are below the findbar. - GdkWindow* content_gdk_window = - tab_contents_->GetContentNativeView()->window; - if (content_gdk_window) - gdk_window_lower(content_gdk_window); + // Sometimes the content native view will be null. + // TODO(estade): will this case ever cause findbar occlusion problems? + if (tab_contents_->GetContentNativeView()) { + GdkWindow* content_gdk_window = + tab_contents_->GetContentNativeView()->window; + if (content_gdk_window) + gdk_window_lower(content_gdk_window); + } } } diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 8b92d59..4e01e8d 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -132,11 +132,7 @@ class TabRestoreUITest : public UITest { // Close the end tab in the current window, then restore it. The tab should be // in its original position, and active. -#if defined(OS_LINUX) -TEST_F(TabRestoreUITest, DISABLED_Basic) { -#else TEST_F(TabRestoreUITest, Basic) { -#endif scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); int starting_tab_count; @@ -164,11 +160,7 @@ TEST_F(TabRestoreUITest, Basic) { // Close a tab not at the end of the current window, then restore it. The tab // should be in its original position, and active. -#if defined(OS_LINUX) -TEST_F(TabRestoreUITest, DISABLED_MiddleTab) { -#else TEST_F(TabRestoreUITest, MiddleTab) { -#endif scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); int starting_tab_count; @@ -197,11 +189,7 @@ TEST_F(TabRestoreUITest, MiddleTab) { // Close a tab, switch windows, then restore the tab. The tab should be in its // original window and position, and active. -#if defined(OS_LINUX) -TEST_F(TabRestoreUITest, DISABLED_RestoreToDifferentWindow) { -#else TEST_F(TabRestoreUITest, RestoreToDifferentWindow) { -#endif scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); // This call is virtually guaranteed to pass, assuming that Chromium is the |