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

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

Issue 8500005: Reverting this as it breaks (at least) the Windows Aura build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
===================================================================
--- chrome/browser/ui/views/aura/chrome_shell_delegate.cc (revision 110804)
+++ chrome/browser/ui/views/aura/chrome_shell_delegate.cc (working copy)
@@ -12,22 +12,12 @@
#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
bool ChromeShellDelegate::ShouldCreateLauncherItemForBrowser(
Browser* browser,
« 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