| Index: ui/wm/core/focus_controller.h
|
| diff --git a/ui/views/corewm/focus_controller.h b/ui/wm/core/focus_controller.h
|
| similarity index 92%
|
| rename from ui/views/corewm/focus_controller.h
|
| rename to ui/wm/core/focus_controller.h
|
| index 1dc69b78219a5a1a759b5c15a5872335bc05508b..9e46ec7d5079cfb770fdc66542f7e08db114368c 100644
|
| --- a/ui/views/corewm/focus_controller.h
|
| +++ b/ui/wm/core/focus_controller.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_
|
| -#define UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_
|
| +#ifndef UI_WM_CORE_FOCUS_CONTROLLER_H_
|
| +#define UI_WM_CORE_FOCUS_CONTROLLER_H_
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -13,7 +13,7 @@
|
| #include "ui/aura/client/focus_client.h"
|
| #include "ui/aura/window_observer.h"
|
| #include "ui/events/event_handler.h"
|
| -#include "ui/views/views_export.h"
|
| +#include "ui/wm/core/wm_core_export.h"
|
|
|
| namespace views {
|
| namespace corewm {
|
| @@ -35,10 +35,10 @@ class FocusRules;
|
| // . Window disposition changes (implemented here in aura::WindowObserver).
|
| // (The FocusController registers itself as an observer of the active and
|
| // focused windows).
|
| -class VIEWS_EXPORT FocusController : public aura::client::ActivationClient,
|
| - public aura::client::FocusClient,
|
| - public ui::EventHandler,
|
| - public aura::WindowObserver {
|
| +class WM_CORE_EXPORT FocusController : public aura::client::ActivationClient,
|
| + public aura::client::FocusClient,
|
| + public ui::EventHandler,
|
| + public aura::WindowObserver {
|
| public:
|
| // |rules| cannot be NULL.
|
| explicit FocusController(FocusRules* rules);
|
| @@ -127,4 +127,4 @@ class VIEWS_EXPORT FocusController : public aura::client::ActivationClient,
|
| } // namespace corewm
|
| } // namespace views
|
|
|
| -#endif // UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_
|
| +#endif // UI_WM_CORE_FOCUS_CONTROLLER_H_
|
|
|