| Index: extensions/shell/browser/shell_desktop_controller.h
|
| diff --git a/apps/shell/browser/shell_desktop_controller.h b/extensions/shell/browser/shell_desktop_controller.h
|
| similarity index 94%
|
| rename from apps/shell/browser/shell_desktop_controller.h
|
| rename to extensions/shell/browser/shell_desktop_controller.h
|
| index d0a5542774055c26280e519804bbb143c3df1e5d..afaef8ad5f2688fc99c4b008aa5b65dd1e0468d6 100644
|
| --- a/apps/shell/browser/shell_desktop_controller.h
|
| +++ b/extensions/shell/browser/shell_desktop_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 APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
|
| -#define APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
|
| +#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
|
| +#define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| @@ -47,7 +47,7 @@ class InputMethodEventFilter;
|
| class UserActivityDetector;
|
| }
|
|
|
| -namespace apps {
|
| +namespace extensions {
|
|
|
| class ShellAppWindow;
|
| class ShellAppWindowController;
|
| @@ -144,6 +144,6 @@ class ShellDesktopController : public aura::client::WindowTreeClient,
|
| DISALLOW_COPY_AND_ASSIGN(ShellDesktopController);
|
| };
|
|
|
| -} // namespace apps
|
| +} // namespace extensions
|
|
|
| -#endif // APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
|
| +#endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
|
|
|