diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 20:08:36 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 20:08:36 +0000 |
| commit | 4eff7becd7a6be9621ae807c7aa3627d95c5913b (patch) | |
| tree | cf03c223fbba7a530e5a455022acf684a1548854 /chrome | |
| parent | 0d3bdf28d7c43169fba92e70aed09f8178cc7004 (diff) | |
| download | chromium_src-4eff7becd7a6be9621ae807c7aa3627d95c5913b.zip chromium_src-4eff7becd7a6be9621ae807c7aa3627d95c5913b.tar.gz chromium_src-4eff7becd7a6be9621ae807c7aa3627d95c5913b.tar.bz2 | |
Revert 131193 - chromeos: No icon shadow for slow boards.
Shadow generate seems causing app list animation janky on slow boards.
Thus, disable it on those boards.
BUG=122371
TEST=Verify fix for issue 122371.
Review URL: http://codereview.chromium.org/10008057
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10032008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/views/ash/app_list/app_list_view_delegate.cc | 32 | ||||
| -rw-r--r-- | chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h | 1 |
2 files changed, 0 insertions, 33 deletions
diff --git a/chrome/browser/ui/views/ash/app_list/app_list_view_delegate.cc b/chrome/browser/ui/views/ash/app_list/app_list_view_delegate.cc index d76aad1..487830b 100644 --- a/chrome/browser/ui/views/ash/app_list/app_list_view_delegate.cc +++ b/chrome/browser/ui/views/ash/app_list/app_list_view_delegate.cc @@ -8,44 +8,12 @@ #include "chrome/browser/ui/views/ash/app_list/app_list_model_builder.h" #include "chrome/browser/ui/views/ash/app_list/chrome_app_list_item.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/system/statistics_provider.h" -#endif - AppListViewDelegate::AppListViewDelegate() { } AppListViewDelegate::~AppListViewDelegate() { } -bool AppListViewDelegate::ShouldGenerateIconShadow() { -#if defined(OS_CHROMEOS) - static bool use_shadow = true; - static bool configured = false; - - if (!configured) { - std::string board; - chromeos::system::StatisticsProvider::GetInstance()->GetMachineStatistic( - "CHROMEOS_RELEASE_BOARD", &board); - - // Boards that should not have shadow. - const char* kBoards[] = { "x86-mario", "x86-alex", "x86-zgb" }; - for (size_t i = 0; i < arraysize(kBoards); ++i) { - if (board == kBoards[i]) { - use_shadow = false; - break; - } - } - - configured = true; - } - - return use_shadow; -#else - return true; -#endif -} - void AppListViewDelegate::SetModel(ash::AppListModel* model) { if (model) { if (!model_builder_.get()) { diff --git a/chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h b/chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h index cb815bf..aefe3ee 100644 --- a/chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h +++ b/chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h @@ -20,7 +20,6 @@ class AppListViewDelegate : public ash::AppListViewDelegate { private: // Overridden from ash::AppListViewDelegate: - virtual bool ShouldGenerateIconShadow() OVERRIDE; virtual void SetModel(ash::AppListModel* model) OVERRIDE; virtual void UpdateModel(const std::string& query) OVERRIDE; virtual void OnAppListItemActivated(ash::AppListItemModel* item, |