summaryrefslogtreecommitdiffstats
path: root/ash/app_list/app_list_model_view.h
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 17:06:59 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 17:06:59 +0000
commit665e2b7b8351b2ce82b7279325f65876df8f5283 (patch)
tree5b3e988e926b42d1e15037448628c17997029e81 /ash/app_list/app_list_model_view.h
parent8cb6d6e6d51c6abd996558daad179b1c4264e93f (diff)
downloadchromium_src-665e2b7b8351b2ce82b7279325f65876df8f5283.zip
chromium_src-665e2b7b8351b2ce82b7279325f65876df8f5283.tar.gz
chromium_src-665e2b7b8351b2ce82b7279325f65876df8f5283.tar.bz2
ash: Update app list UI to match latest crwm.
- Tile app list item horizontally; - Move item title to the bottom; - Update padding for model view: 45px from left/right and 32px from top/bottom; - Change shade from 0.4 black to 0.2 black; - Update animation; - Defer app list widget activation until showing animation is finished; BUG=117238,117073 TEST=Verify fix for issue 117238. Review URL: https://chromiumcodereview.appspot.com/9677065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/app_list/app_list_model_view.h')
-rw-r--r--ash/app_list/app_list_model_view.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/app_list/app_list_model_view.h b/ash/app_list/app_list_model_view.h
index af856f4..a5273f3 100644
--- a/ash/app_list/app_list_model_view.h
+++ b/ash/app_list/app_list_model_view.h
@@ -37,7 +37,6 @@ class AppListModelView : public views::View,
AppListItemView* GetItemViewAtIndex(int index);
void SetSelectedItemByIndex(int index);
- int SetTileIconSizeAndGetMaxWidth(int icon_dimension);
// Overridden from views::View:
virtual void Layout() OVERRIDE;
@@ -54,7 +53,7 @@ class AppListModelView : public views::View,
views::ButtonListener* listener_;
int selected_item_index_;
- int items_per_col_;
+ int items_per_row_;
DISALLOW_COPY_AND_ASSIGN(AppListModelView);
};