diff options
| author | mfomitchev <mfomitchev@chromium.org> | 2016-03-22 10:58:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 18:01:24 +0000 |
| commit | 6faac8e11eb23bcce95fc54f03e96e771a8c44c9 (patch) | |
| tree | 523a95e6f08f3cb0052360e64f8aefe7c146228a | |
| parent | efc57ff133fe8722379d1f93d2accc4c8dfd4c7a (diff) | |
| download | chromium_src-6faac8e11eb23bcce95fc54f03e96e771a8c44c9.zip chromium_src-6faac8e11eb23bcce95fc54f03e96e771a8c44c9.tar.gz chromium_src-6faac8e11eb23bcce95fc54f03e96e771a8c44c9.tar.bz2 | |
Getting rid of the static ChromeShellDelegate instance accessor
BUG=NONE
Review URL: https://codereview.chromium.org/1742773002
Cr-Commit-Position: refs/heads/master@{#382607}
| -rw-r--r-- | chrome/browser/ui/ash/chrome_shell_delegate.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/ash/chrome_shell_delegate.h | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index 4d199ec..c7490a4 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc @@ -50,18 +50,12 @@ const char kKeyboardShortcutHelpPageUrl[] = } // namespace -// static -ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; - ChromeShellDelegate::ChromeShellDelegate() : shelf_delegate_(NULL) { - instance_ = this; PlatformInit(); } ChromeShellDelegate::~ChromeShellDelegate() { - if (instance_ == this) - instance_ = NULL; } bool ChromeShellDelegate::IsMultiProfilesEnabled() const { diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h index 0fcf87e7..0d62892f 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.h +++ b/chrome/browser/ui/ash/chrome_shell_delegate.h @@ -35,8 +35,6 @@ class ChromeShellDelegate : public ash::ShellDelegate, ChromeShellDelegate(); ~ChromeShellDelegate() override; - static ChromeShellDelegate* instance() { return instance_; } - // ash::ShellDelegate overrides; bool IsFirstRunAfterBoot() const override; bool IsMultiProfilesEnabled() const override; @@ -78,8 +76,6 @@ class ChromeShellDelegate : public ash::ShellDelegate, private: void PlatformInit(); - static ChromeShellDelegate* instance_; - content::NotificationRegistrar registrar_; ChromeLauncherController* shelf_delegate_; |