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

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: nit indenting Created 7 years, 4 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/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 2574a61b48891eff8499c12630faa2ec18a975b3..286618067e58c43f7513bb9e27314c7653bb7f3c 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,10 @@ class AppListShower {
return view_->GetWindow();
}
+ app_list::AppListView* GetView() {
+ return view_->view();
+ }
+
void OnSigninStatusChanged() {
if (view_)
view_->OnSigninStatusChanged();
@@ -805,6 +811,7 @@ class AppListController : public AppListServiceImpl {
virtual bool IsAppListVisible() const OVERRIDE;
virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
virtual AppListControllerDelegate* CreateControllerDelegate() OVERRIDE;
+ virtual app_list::AppListModel* GetAppListModelForTesting() OVERRIDE;
// AppListServiceImpl overrides:
virtual void CreateShortcut() OVERRIDE;
@@ -928,6 +935,10 @@ AppListControllerDelegate* AppListController::CreateControllerDelegate() {
return new AppListControllerDelegateWin();
}
+app_list::AppListModel* AppListController::GetAppListModelForTesting() {
+ return shower_->GetView()->model();
koz (OOO until 15th September) 2013/08/28 00:37:43 Could you change this to shower_->GetCurrentModel(
tapted 2013/08/28 03:09:48 Done.
+}
+
void AppListController::ShowForProfile(Profile* requested_profile) {
DCHECK(requested_profile);
if (requested_profile->IsManaged())

Powered by Google App Engine
This is Rietveld 408576698