| Index: ui/views/focus/focus_manager_factory.cc
|
| diff --git a/ui/views/focus/focus_manager_factory.cc b/ui/views/focus/focus_manager_factory.cc
|
| index b8e1a7a92e3d2a2df0d77508bdef4e1310212429..be17f75218ea9bdf53e2806b7d81feee10138eb3 100644
|
| --- a/ui/views/focus/focus_manager_factory.cc
|
| +++ b/ui/views/focus/focus_manager_factory.cc
|
| @@ -7,17 +7,17 @@
|
| #include "base/compiler_specific.h"
|
| #include "ui/views/focus/focus_manager.h"
|
|
|
| -namespace {
|
| +namespace views {
|
|
|
| -using views::FocusManager;
|
| +namespace {
|
|
|
| -class DefaultFocusManagerFactory : public views::FocusManagerFactory {
|
| +class DefaultFocusManagerFactory : public FocusManagerFactory {
|
| public:
|
| - DefaultFocusManagerFactory() : views::FocusManagerFactory() {}
|
| + DefaultFocusManagerFactory() : FocusManagerFactory() {}
|
| virtual ~DefaultFocusManagerFactory() {}
|
|
|
| protected:
|
| - virtual FocusManager* CreateFocusManager(views::Widget* widget) OVERRIDE {
|
| + virtual FocusManager* CreateFocusManager(Widget* widget) OVERRIDE {
|
| return new FocusManager(widget, NULL /* delegate */);
|
| }
|
|
|
| @@ -25,12 +25,10 @@ class DefaultFocusManagerFactory : public views::FocusManagerFactory {
|
| DISALLOW_COPY_AND_ASSIGN(DefaultFocusManagerFactory);
|
| };
|
|
|
| -views::FocusManagerFactory* focus_manager_factory = NULL;
|
| +FocusManagerFactory* focus_manager_factory = NULL;
|
|
|
| } // namespace
|
|
|
| -namespace views {
|
| -
|
| FocusManagerFactory::FocusManagerFactory() {
|
| }
|
|
|
|
|