| Index: extensions/shell/browser/shell_app_sorting.h
|
| diff --git a/apps/shell/browser/shell_app_sorting.h b/extensions/shell/browser/shell_app_sorting.h
|
| similarity index 82%
|
| rename from apps/shell/browser/shell_app_sorting.h
|
| rename to extensions/shell/browser/shell_app_sorting.h
|
| index a7f50d6b9fd8dbcfa25253f03edadc4d84e893b3..e5e62ce131a9065d4445472b1e939b3e5c6328bf 100644
|
| --- a/apps/shell/browser/shell_app_sorting.h
|
| +++ b/extensions/shell/browser/shell_app_sorting.h
|
| @@ -2,28 +2,26 @@
|
| // 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_APP_SORTING_H_
|
| -#define APPS_SHELL_BROWSER_SHELL_APP_SORTING_H_
|
| +#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_APP_SORTING_H_
|
| +#define EXTENSIONS_SHELL_BROWSER_SHELL_APP_SORTING_H_
|
|
|
| #include "base/compiler_specific.h"
|
| #include "extensions/browser/app_sorting.h"
|
|
|
| -namespace apps {
|
| +namespace extensions {
|
|
|
| // A stub AppSorting. Since app_shell only runs a single app we don't need to
|
| // sort them.
|
| -class ShellAppSorting : public extensions::AppSorting {
|
| +class ShellAppSorting : public AppSorting {
|
| public:
|
| ShellAppSorting();
|
| virtual ~ShellAppSorting();
|
|
|
| - // extensions::AppSorting overrides:
|
| - virtual void SetExtensionScopedPrefs(extensions::ExtensionScopedPrefs* prefs)
|
| - OVERRIDE;
|
| + // AppSorting overrides:
|
| + virtual void SetExtensionScopedPrefs(ExtensionScopedPrefs* prefs) OVERRIDE;
|
| virtual void SetExtensionSyncService(
|
| ExtensionSyncService* extension_sync_service) OVERRIDE;
|
| - virtual void Initialize(
|
| - const extensions::ExtensionIdList& extension_ids) OVERRIDE;
|
| + virtual void Initialize(const ExtensionIdList& extension_ids) OVERRIDE;
|
| virtual void FixNTPOrdinalCollisions() OVERRIDE;
|
| virtual void EnsureValidOrdinals(
|
| const std::string& extension_id,
|
| @@ -60,6 +58,6 @@ class ShellAppSorting : public extensions::AppSorting {
|
| DISALLOW_COPY_AND_ASSIGN(ShellAppSorting);
|
| };
|
|
|
| -} // namespace apps
|
| +} // namespace extensions
|
|
|
| -#endif // APPS_SHELL_BROWSER_SHELL_APP_SORTING_H_
|
| +#endif // EXTENSIONS_SHELL_BROWSER_SHELL_APP_SORTING_H_
|
|
|