diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 23:35:22 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-16 23:35:22 +0000 |
| commit | bee5aebd4e8059b96005feb913c0cf5833528b90 (patch) | |
| tree | 2d10946e5b9f84220bd8a193a21c98cb00cc485a | |
| parent | 42e8de911a526f8c86a7f5e5fc7dce82a647f6d0 (diff) | |
| download | chromium_src-bee5aebd4e8059b96005feb913c0cf5833528b90.zip chromium_src-bee5aebd4e8059b96005feb913c0cf5833528b90.tar.gz chromium_src-bee5aebd4e8059b96005feb913c0cf5833528b90.tar.bz2 | |
Fix linux unit tests by checking for NULL that's impossible in real code, but needed in unit tests.
TBR=willchan
Review URL: http://codereview.chromium.org/155663
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20917 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/gtk/go_button_gtk.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/go_button_gtk.cc b/chrome/browser/gtk/go_button_gtk.cc index 34455de..43f3092 100644 --- a/chrome/browser/gtk/go_button_gtk.cc +++ b/chrome/browser/gtk/go_button_gtk.cc @@ -101,7 +101,7 @@ void GoButtonGtk::OnButtonTimer() { gboolean GoButtonGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e, GoButtonGtk* button) { - if (button->theme_provider_->UseGtkTheme()) { + if (button->theme_provider_ && button->theme_provider_->UseGtkTheme()) { return FALSE; } else { if (button->visible_mode_ == MODE_GO) { @@ -199,7 +199,7 @@ void GoButtonGtk::SetTooltip() { } void GoButtonGtk::UpdateThemeButtons() { - if (theme_provider_->UseGtkTheme()) { + if (theme_provider_ && theme_provider_->UseGtkTheme()) { // TODO(erg): Waiting for Glen to make a version of these that don't have a // button border on it. if (intended_mode_ == MODE_GO) { |