| Index: athena/extensions/chrome/app_list_controller_delegate_athena.h
|
| diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h b/athena/extensions/chrome/app_list_controller_delegate_athena.h
|
| similarity index 75%
|
| copy from chrome/browser/ui/ash/app_list/app_list_controller_ash.h
|
| copy to athena/extensions/chrome/app_list_controller_delegate_athena.h
|
| index 9be7ae330c66e0f62cd1b9220451261a65bfc546..78c6de1065d857706df6347ead7be8619f682f3a 100644
|
| --- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
|
| +++ b/athena/extensions/chrome/app_list_controller_delegate_athena.h
|
| @@ -1,19 +1,20 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_
|
| -#define CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_
|
| +#ifndef ATHENA_EXTENSIONS_CHROME_APP_LIST_CONTROLLER_DELEGATE_ATHENA_H_
|
| +#define ATHENA_EXTENSIONS_CHROME_APP_LIST_CONTROLLER_DELEGATE_ATHENA_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
|
| -#include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
|
|
|
| -class AppListControllerDelegateAsh : public AppListControllerDelegate {
|
| +namespace athena {
|
| +
|
| +class AppListControllerDelegateAthena : public AppListControllerDelegate {
|
| public:
|
| - AppListControllerDelegateAsh();
|
| - virtual ~AppListControllerDelegateAsh();
|
| + AppListControllerDelegateAthena();
|
| + virtual ~AppListControllerDelegateAthena();
|
|
|
| private:
|
| // AppListControllerDelegate overrides:
|
| @@ -47,9 +48,9 @@ class AppListControllerDelegateAsh : public AppListControllerDelegate {
|
| const base::FilePath& profile_path) override;
|
| virtual bool ShouldShowUserIcon() override;
|
|
|
| - ash::LaunchSource AppListSourceToLaunchSource(AppListSource source);
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateAsh);
|
| + DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateAthena);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_
|
| +} // namespace athena
|
| +
|
| +#endif // ATHENA_EXTENSIONS_CHROME_APP_LIST_CONTROLLER_DELEGATE_ATHENA_H_
|
|
|