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

Unified Diff: chrome/browser/ui/views/app_list/app_list_controller_win.cc

Issue 23072036: Adds an integration test for uninstalling app list search results. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 3 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
« no previous file with comments | « chrome/browser/ui/app_list/test/app_list_service_test_api_win.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/app_list/app_list_controller_win.cc
diff --git a/chrome/browser/ui/views/app_list/app_list_controller_win.cc b/chrome/browser/ui/views/app_list/app_list_controller_win.cc
index 6c8e55167b9fa772429ff00ed5d6c785ae01a7b6..5d93f3fbbcba61c3c84af43489a3f7cadb16c8f1 100644
--- a/chrome/browser/ui/views/app_list/app_list_controller_win.cc
+++ b/chrome/browser/ui/views/app_list/app_list_controller_win.cc
@@ -568,6 +568,8 @@ class AppListViewWin {
window_icon_updated_(false) {
}
+ app_list::AppListView* view() { return view_; }
+
void Show() {
view_->GetWidget()->Show();
if (!window_icon_updated_) {
@@ -699,6 +701,12 @@ class AppListShower {
return view_->GetWindow();
}
+ app_list::AppListModel* GetGurrentModel() {
+ if (!view_)
+ return NULL;
+ return view_->view()->model();
+ }
+
void OnSigninStatusChanged() {
if (view_)
view_->OnSigninStatusChanged();
@@ -790,7 +798,7 @@ class AppListShower {
// TODO(tapted): Rename this class to AppListServiceWin and move entire file to
// chrome/browser/ui/app_list/app_list_service_win.cc after removing
// chrome/browser/ui/views dependency.
-class AppListController : public AppListServiceImpl {
+class AppListController : public AppListServiceWin {
public:
virtual ~AppListController();
@@ -820,6 +828,9 @@ class AppListController : public AppListServiceImpl {
// AppListServiceImpl overrides:
virtual void CreateShortcut() OVERRIDE;
+ // AppListServiceWin overrides:
+ virtual app_list::AppListModel* GetAppListModelForTesting() OVERRIDE;
+
private:
friend struct DefaultSingletonTraits<AppListController>;
@@ -939,6 +950,10 @@ AppListControllerDelegate* AppListController::CreateControllerDelegate() {
return new AppListControllerDelegateWin();
}
+app_list::AppListModel* AppListController::GetAppListModelForTesting() {
+ return shower_->GetGurrentModel();
+}
+
void AppListController::ShowForProfile(Profile* requested_profile) {
DCHECK(requested_profile);
if (requested_profile->IsManaged())
« no previous file with comments | « chrome/browser/ui/app_list/test/app_list_service_test_api_win.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698