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

Side by Side Diff: ui/app_list/test/app_list_test_view_delegate.cc

Issue 283443003: AppListTestViewDelegate::ShouldCenterWindow returns the proper value. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/app_list/test/app_list_test_view_delegate.h" 5 #include "ui/app_list/test/app_list_test_view_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "ui/app_list/app_list_model.h" 11 #include "ui/app_list/app_list_model.h"
12 #include "ui/app_list/app_list_switches.h"
12 #include "ui/app_list/app_list_view_delegate_observer.h" 13 #include "ui/app_list/app_list_view_delegate_observer.h"
13 #include "ui/app_list/signin_delegate.h" 14 #include "ui/app_list/signin_delegate.h"
14 #include "ui/app_list/test/app_list_test_model.h" 15 #include "ui/app_list/test/app_list_test_model.h"
15 #include "ui/gfx/image/image_skia.h" 16 #include "ui/gfx/image/image_skia.h"
16 17
17 namespace app_list { 18 namespace app_list {
18 namespace test { 19 namespace test {
19 20
20 class TestSigninDelegate : public SigninDelegate { 21 class TestSigninDelegate : public SigninDelegate {
21 public: 22 public:
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 124
124 content::WebContents* AppListTestViewDelegate::GetSpeechRecognitionContents() { 125 content::WebContents* AppListTestViewDelegate::GetSpeechRecognitionContents() {
125 return NULL; 126 return NULL;
126 } 127 }
127 128
128 const AppListViewDelegate::Users& AppListTestViewDelegate::GetUsers() const { 129 const AppListViewDelegate::Users& AppListTestViewDelegate::GetUsers() const {
129 return users_; 130 return users_;
130 } 131 }
131 132
132 bool AppListTestViewDelegate::ShouldCenterWindow() const { 133 bool AppListTestViewDelegate::ShouldCenterWindow() const {
133 return false; 134 return app_list::switches::IsCenteredAppListEnabled();
Matt Giuca 2014/05/12 06:30:38 Note: To understand what this is doing, have a loo
134 } 135 }
135 136
136 void AppListTestViewDelegate::ReplaceTestModel(int item_count) { 137 void AppListTestViewDelegate::ReplaceTestModel(int item_count) {
137 model_.reset(new AppListTestModel); 138 model_.reset(new AppListTestModel);
138 model_->PopulateApps(item_count); 139 model_->PopulateApps(item_count);
139 } 140 }
140 141
141 void AppListTestViewDelegate::AddObserver( 142 void AppListTestViewDelegate::AddObserver(
142 AppListViewDelegateObserver* observer) { 143 AppListViewDelegateObserver* observer) {
143 observers_.AddObserver(observer); 144 observers_.AddObserver(observer);
144 } 145 }
145 146
146 void AppListTestViewDelegate::RemoveObserver( 147 void AppListTestViewDelegate::RemoveObserver(
147 AppListViewDelegateObserver* observer) { 148 AppListViewDelegateObserver* observer) {
148 observers_.RemoveObserver(observer); 149 observers_.RemoveObserver(observer);
149 } 150 }
150 151
151 } // namespace test 152 } // namespace test
152 } // namespace app_list 153 } // namespace app_list
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698