| Index: ui/app_list/test/app_list_test_view_delegate.cc
|
| diff --git a/ui/app_list/test/app_list_test_view_delegate.cc b/ui/app_list/test/app_list_test_view_delegate.cc
|
| index 443724bb3972bd0bd85a91d7752f99dc33308109..9202127bb144508fea5d3a76865c307afdca800c 100644
|
| --- a/ui/app_list/test/app_list_test_view_delegate.cc
|
| +++ b/ui/app_list/test/app_list_test_view_delegate.cc
|
| @@ -34,15 +34,6 @@ int AppListTestViewDelegate::GetStopSpeechRecognitionCountAndReset() {
|
| return count;
|
| }
|
|
|
| -bool AppListTestViewDelegate::ForceNativeDesktop() const {
|
| - return false;
|
| -}
|
| -
|
| -void AppListTestViewDelegate::SetProfileByPath(
|
| - const base::FilePath& profile_path) {
|
| - ReplaceTestModel(next_profile_app_count_);
|
| -}
|
| -
|
| AppListModel* AppListTestViewDelegate::GetModel() {
|
| return model_.get();
|
| }
|
| @@ -80,7 +71,6 @@ void AppListTestViewDelegate::StopSpeechRecognition() {
|
| ++stop_speech_recognition_count_;
|
| }
|
|
|
| -#if defined(TOOLKIT_VIEWS)
|
| views::View* AppListTestViewDelegate::CreateStartPageWebView(
|
| const gfx::Size& size) {
|
| return NULL;
|
| @@ -89,16 +79,11 @@ std::vector<views::View*> AppListTestViewDelegate::CreateCustomPageWebViews(
|
| const gfx::Size& size) {
|
| return std::vector<views::View*>();
|
| }
|
| -#endif
|
|
|
| bool AppListTestViewDelegate::IsSpeechRecognitionEnabled() {
|
| return false;
|
| }
|
|
|
| -const AppListViewDelegate::Users& AppListTestViewDelegate::GetUsers() const {
|
| - return users_;
|
| -}
|
| -
|
| void AppListTestViewDelegate::ReplaceTestModel(int item_count) {
|
| model_.reset(new AppListTestModel);
|
| model_->PopulateApps(item_count);
|
|
|