Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Unified Diff: chrome/browser/ui/app_list/test/test_app_list_controller_delegate.h

Issue 644863002: Introduce OpenURL to AppListControllerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/test/test_app_list_controller_delegate.h
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h b/chrome/browser/ui/app_list/test/test_app_list_controller_delegate.h
similarity index 61%
copy from chrome/browser/ui/ash/app_list/app_list_controller_ash.h
copy to chrome/browser/ui/app_list/test/test_app_list_controller_delegate.h
index 19f842d0b29bf1af63cf5d0bcf2403212de0a522..a715e75530a3309197ed6f2c54a40d44969c0a26 100644
--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
+++ b/chrome/browser/ui/app_list/test/test_app_list_controller_delegate.h
@@ -1,36 +1,37 @@
-// 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 CHROME_BROWSER_UI_APP_LIST_TEST_TEST_APP_LIST_CONTROLLER_DELEGATE_H_
+#define CHROME_BROWSER_UI_APP_LIST_TEST_TEST_APP_LIST_CONTROLLER_DELEGATE_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 test {
+
+class TestAppListControllerDelegate : public AppListControllerDelegate {
public:
- AppListControllerDelegateAsh();
- virtual ~AppListControllerDelegateAsh();
+ TestAppListControllerDelegate();
+ virtual ~TestAppListControllerDelegate();
- private:
- // AppListControllerDelegate overrides:
virtual void DismissView() override;
virtual gfx::NativeWindow GetAppListWindow() override;
- virtual gfx::Rect GetAppListBounds() override;
virtual gfx::ImageSkia GetWindowIcon() override;
virtual bool IsAppPinned(const std::string& extension_id) override;
virtual void PinApp(const std::string& extension_id) override;
virtual void UnpinApp(const std::string& extension_id) override;
virtual Pinnable GetPinnable() override;
- virtual void OnShowChildDialog() override;
- virtual void OnCloseChildDialog() override;
virtual bool CanDoCreateShortcutsFlow() override;
virtual void DoCreateShortcutsFlow(Profile* profile,
const std::string& extension_id) override;
+ virtual bool CanDoShowAppInfoFlow() override;
+ virtual void DoShowAppInfoFlow(Profile* profile,
+ const std::string& extension_id) override;
virtual void CreateNewWindow(Profile* profile, bool incognito) override;
+ virtual void OpenURL(Profile* profile,
+ const GURL& url,
+ ui::PageTransition transition,
+ WindowOpenDisposition deposition) override;
virtual void ActivateApp(Profile* profile,
const extensions::Extension* extension,
AppListSource source,
@@ -42,10 +43,8 @@ class AppListControllerDelegateAsh : public AppListControllerDelegate {
virtual void ShowForProfileByPath(
const base::FilePath& profile_path) override;
virtual bool ShouldShowUserIcon() override;
-
- ash::LaunchSource AppListSourceToLaunchSource(AppListSource source);
-
- DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateAsh);
};
-#endif // CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_
+} // namespace test
+
+#endif // CHROME_BROWSER_UI_APP_LIST_TEST_TEST_APP_LIST_CONTROLLER_DELEGATE_H_

Powered by Google App Engine
This is Rietveld 408576698