Commit 0ae20ea3 authored by mgiuca@chromium.org's avatar mgiuca@chromium.org

AppListTestViewDelegate::ShouldCenterWindow returns the proper value.

Previously, AppListControllerTest's "centered" tests were actually
testing the non-centered app list mode (due to an uncaught semantic
merge conflict between SVN 268479 and 269208). Now the centered tests
run the app list in centered mode.

BUG=372268

Review URL: https://codereview.chromium.org/283443003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269769 0039d316-1c4b-4281-b951-d872f2087c98
parent 3567d142
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "base/callback.h" #include "base/callback.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "ui/app_list/app_list_model.h" #include "ui/app_list/app_list_model.h"
#include "ui/app_list/app_list_switches.h"
#include "ui/app_list/app_list_view_delegate_observer.h" #include "ui/app_list/app_list_view_delegate_observer.h"
#include "ui/app_list/signin_delegate.h" #include "ui/app_list/signin_delegate.h"
#include "ui/app_list/test/app_list_test_model.h" #include "ui/app_list/test/app_list_test_model.h"
...@@ -130,7 +131,7 @@ const AppListViewDelegate::Users& AppListTestViewDelegate::GetUsers() const { ...@@ -130,7 +131,7 @@ const AppListViewDelegate::Users& AppListTestViewDelegate::GetUsers() const {
} }
bool AppListTestViewDelegate::ShouldCenterWindow() const { bool AppListTestViewDelegate::ShouldCenterWindow() const {
return false; return app_list::switches::IsCenteredAppListEnabled();
} }
void AppListTestViewDelegate::ReplaceTestModel(int item_count) { void AppListTestViewDelegate::ReplaceTestModel(int item_count) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment