diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-18 00:21:13 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-18 00:21:13 +0000 |
| commit | 892291027433777a9ac390b9f54df7d4adb41412 (patch) | |
| tree | 5ec0b778a498892e51694af6687f982573c201a3 | |
| parent | 60db93c6830003b36b8ff2dd218f5250bc3bb1c0 (diff) | |
| download | chromium_src-892291027433777a9ac390b9f54df7d4adb41412.zip chromium_src-892291027433777a9ac390b9f54df7d4adb41412.tar.gz chromium_src-892291027433777a9ac390b9f54df7d4adb41412.tar.bz2 | |
null check for GetLastActive in NotifyThemeChanged.
BUG=chromium-os:13082
TEST=none
Review URL: http://codereview.chromium.org/6688011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78637 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/gtk/gtk_theme_provider.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/gtk_theme_provider.cc b/chrome/browser/ui/gtk/gtk_theme_provider.cc index 119cc84..88394db 100644 --- a/chrome/browser/ui/gtk/gtk_theme_provider.cc +++ b/chrome/browser/ui/gtk/gtk_theme_provider.cc @@ -7,6 +7,7 @@ #include <gtk/gtk.h> #include <set> +#include <string> #include "base/environment.h" #include "base/nix/xdg_util.h" @@ -635,8 +636,10 @@ void GtkThemeProvider::NotifyThemeChanged(const Extension* extension) { GTK_CHROME_BUTTON(*it), use_gtk_); } - GtkWindow* window = BrowserList::GetLastActive()->window()->GetNativeHandle(); - gtk_util::SetDefaultWindowIcon(window); + Browser* browser = BrowserList::GetLastActive(); + if (browser && browser->window()) { + gtk_util::SetDefaultWindowIcon(browser->window()->GetNativeHandle()); + } } void GtkThemeProvider::FreePlatformCaches() { |