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

Unified Diff: ui/app_list/test/app_list_test_view_delegate.h

Issue 305123002: Fix crash in the experimental app list StartPageView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add profile change tests Created 6 years, 7 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: ui/app_list/test/app_list_test_view_delegate.h
diff --git a/ui/app_list/test/app_list_test_view_delegate.h b/ui/app_list/test/app_list_test_view_delegate.h
index ff929c61588b6326e2fccbb6e1c5d0858c7d668f..4cdc64720f884f27c8c7119e6dea2c321a8c5f19 100644
--- a/ui/app_list/test/app_list_test_view_delegate.h
+++ b/ui/app_list/test/app_list_test_view_delegate.h
@@ -36,6 +36,10 @@ class AppListTestViewDelegate : public AppListViewDelegate {
return open_search_result_counts_;
}
+ // Sets the number of apps that the model will be created with the next time
+ // SetProfileByPath() is called.
+ void set_next_profile_app_count(int apps) { next_profile_app_count_ = apps; }
+
void set_auto_launch_timeout(const base::TimeDelta& timeout) {
auto_launch_timeout_ = timeout;
}
@@ -46,7 +50,7 @@ class AppListTestViewDelegate : public AppListViewDelegate {
// AppListViewDelegate overrides:
virtual bool ForceNativeDesktop() const OVERRIDE;
- virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE {}
+ virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE;
virtual AppListModel* GetModel() OVERRIDE;
virtual SigninDelegate* GetSigninDelegate() OVERRIDE;
virtual SpeechUIModel* GetSpeechUI() OVERRIDE;
@@ -89,6 +93,7 @@ class AppListTestViewDelegate : public AppListViewDelegate {
private:
int dismiss_count_;
int open_search_result_count_;
+ int next_profile_app_count_;
std::map<size_t, int> open_search_result_counts_;
Users users_;
scoped_ptr<TestSigninDelegate> test_signin_delegate_;
« no previous file with comments | « no previous file | ui/app_list/test/app_list_test_view_delegate.cc » ('j') | ui/app_list/views/app_list_view_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698