diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 16:07:12 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 16:07:12 +0000 |
| commit | 39dd9bc271d69d85d3189847b01e911d8ac7aeda (patch) | |
| tree | fd3c3a40714a2b2dae82b2466517969138024d45 /ash/wm/ash_focus_rules.h | |
| parent | 9a6cfefacd9f3509fd3b85f453fb4e5dd1f001d7 (diff) | |
| download | chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.zip chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.gz chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.bz2 | |
Revert "Move wm/core to wm namespace."
This reverts commit 521c703f8d62fa698c3e88287c64d8d23f9ac675.
Broke gyp
BUG=
Review URL: https://codereview.chromium.org/199263002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/ash_focus_rules.h')
| -rw-r--r-- | ash/wm/ash_focus_rules.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/ash_focus_rules.h b/ash/wm/ash_focus_rules.h index b5774a2..5780573 100644 --- a/ash/wm/ash_focus_rules.h +++ b/ash/wm/ash_focus_rules.h @@ -13,13 +13,13 @@ namespace ash { namespace wm { -class ASH_EXPORT AshFocusRules : public ::wm::BaseFocusRules { +class ASH_EXPORT AshFocusRules : public views::corewm::BaseFocusRules { public: AshFocusRules(); virtual ~AshFocusRules(); private: - // Overridden from ::wm::BaseFocusRules: + // Overridden from views::corewm::BaseFocusRules: virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE; virtual bool IsWindowConsideredVisibleForActivation( aura::Window* window) const OVERRIDE; |