Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: chrome/browser/ui/views/aura/chrome_shell_delegate.cc

Issue 8600001: Fixes bug where clock button wasn't updating in response to a timezone (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge and allow NULL Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/aura/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
index cc0dec6597e250aed6692d3ebb46977190177ce8..e07bf43506f3ec8f77a6c9643dab2cbe2af568fd 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
@@ -12,10 +12,20 @@
#include "ui/aura/window.h"
#include "ui/aura_shell/launcher/launcher_types.h"
+// static
+ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
+
ChromeShellDelegate::ChromeShellDelegate() {
+ instance_ = this;
}
ChromeShellDelegate::~ChromeShellDelegate() {
+ if (instance_ == this)
+ instance_ = NULL;
+}
+
+const views::View* ChromeShellDelegate::GetStatusArea() const {
+ return status_area_host_->GetStatusArea();
}
// static
« no previous file with comments | « chrome/browser/ui/views/aura/chrome_shell_delegate.h ('k') | chrome/browser/ui/views/aura/status_area_host_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698