diff options
| author | afakhry <afakhry@chromium.org> | 2015-05-21 19:45:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-22 02:46:18 +0000 |
| commit | 5815939bfe669ccf0a22bc90f943b0c45e80891f (patch) | |
| tree | b7ed227030e8eb5a6f2b5ac8890d075880bd89a8 /ash/wm/ash_focus_rules.h | |
| parent | 2aea724021cc800ffb3a5d8d7a20e8c4b3d58317 (diff) | |
| download | chromium_src-5815939bfe669ccf0a22bc90f943b0c45e80891f.zip chromium_src-5815939bfe669ccf0a22bc90f943b0c45e80891f.tar.gz chromium_src-5815939bfe669ccf0a22bc90f943b0c45e80891f.tar.bz2 | |
Fix a possible crash if Shell was destroyed as a result of an OnChannelError()
MruWindowTracker must be destroyed after all windows have been
destroyed.
R=oshima@chromium.org
BUG=485438
Review URL: https://codereview.chromium.org/1154553002
Cr-Commit-Position: refs/heads/master@{#331054}
Diffstat (limited to 'ash/wm/ash_focus_rules.h')
| -rw-r--r-- | ash/wm/ash_focus_rules.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ash/wm/ash_focus_rules.h b/ash/wm/ash_focus_rules.h index 0249eb0..57cf98a 100644 --- a/ash/wm/ash_focus_rules.h +++ b/ash/wm/ash_focus_rules.h @@ -6,7 +6,6 @@ #define ASH_WM_ASH_FOCUS_RULES_H_ #include "ash/ash_export.h" -#include "ash/shell_observer.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/wm/core/base_focus_rules.h" @@ -14,8 +13,7 @@ namespace ash { namespace wm { -class ASH_EXPORT AshFocusRules : public ::wm::BaseFocusRules, - public ash::ShellObserver { +class ASH_EXPORT AshFocusRules : public ::wm::BaseFocusRules { public: AshFocusRules(); ~AshFocusRules() override; @@ -32,9 +30,6 @@ class ASH_EXPORT AshFocusRules : public ::wm::BaseFocusRules, bool CanActivateWindow(aura::Window* window) const override; aura::Window* GetNextActivatableWindow(aura::Window* ignore) const override; - // ash::ShellObserver: - void OnAppTerminating() override; - aura::Window* GetTopmostWindowToActivateForContainerIndex( int index, aura::Window* ignore) const; @@ -42,8 +37,6 @@ class ASH_EXPORT AshFocusRules : public ::wm::BaseFocusRules, aura::Window* container, aura::Window* ignore) const; - bool is_shutting_down_; - DISALLOW_COPY_AND_ASSIGN(AshFocusRules); }; |