| Index: ash/shell/app_list.cc
|
| diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
|
| index 5a17add16d4aabf4590b27249d596064bbaba8af..689e3e2613edce3918bdf55060862227aa792b6e 100644
|
| --- a/ash/shell/app_list.cc
|
| +++ b/ash/shell/app_list.cc
|
| @@ -57,11 +57,7 @@ class WindowTypeShelfItem : public app_list::AppListItem {
|
|
|
| static gfx::ImageSkia GetIcon(Type type) {
|
| static const SkColor kColors[] = {
|
| - SK_ColorRED,
|
| - SK_ColorGREEN,
|
| - SK_ColorBLUE,
|
| - SK_ColorYELLOW,
|
| - SK_ColorCYAN,
|
| + SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorYELLOW, SK_ColorCYAN,
|
| };
|
|
|
| const int kIconSize = 128;
|
| @@ -104,7 +100,7 @@ class WindowTypeShelfItem : public app_list::AppListItem {
|
| }
|
|
|
| static void ActivateItem(Type type, int event_flags) {
|
| - switch (type) {
|
| + switch (type) {
|
| case TOPLEVEL_WINDOW: {
|
| ToplevelWindow::CreateParams params;
|
| params.can_resize = true;
|
| @@ -150,8 +146,7 @@ WindowTypeShelfItem::WindowTypeShelfItem(const std::string& id, Type type)
|
| SetName(title);
|
| }
|
|
|
| -WindowTypeShelfItem::~WindowTypeShelfItem() {
|
| -}
|
| +WindowTypeShelfItem::~WindowTypeShelfItem() {}
|
|
|
| // ExampleSearchResult is an app list search result. It provides what icon to
|
| // show, what should title and details text look like. It also carries the
|
| @@ -176,9 +171,8 @@ class ExampleSearchResult : public app_list::SearchResult {
|
| title = base::i18n::ToLower(title);
|
| size_t match_start = title.find(query);
|
| while (match_start != base::string16::npos) {
|
| - title_tags.push_back(Tag(Tag::MATCH,
|
| - match_start,
|
| - match_start + match_len));
|
| + title_tags.push_back(
|
| + Tag(Tag::MATCH, match_start, match_start + match_len));
|
| match_start = title.find(query, match_start + match_len);
|
| }
|
| set_title_tags(title_tags);
|
| @@ -206,8 +200,7 @@ class ExampleSearchResult : public app_list::SearchResult {
|
|
|
| class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
|
| public:
|
| - ExampleAppListViewDelegate()
|
| - : model_(new app_list::AppListModel) {
|
| + ExampleAppListViewDelegate() : model_(new app_list::AppListModel) {
|
| PopulateApps();
|
| DecorateSearchBox(model_->search_box());
|
| }
|
| @@ -230,10 +223,7 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
|
|
|
| gfx::Canvas canvas(icon_size, 1.0f, false /* is_opaque */);
|
| canvas.DrawStringRectWithFlags(
|
| - icon_text,
|
| - gfx::FontList(),
|
| - SK_ColorBLACK,
|
| - gfx::Rect(icon_size),
|
| + icon_text, gfx::FontList(), SK_ColorBLACK, gfx::Rect(icon_size),
|
| gfx::Canvas::TEXT_ALIGN_CENTER | gfx::Canvas::NO_SUBPIXEL_RENDERING);
|
|
|
| return gfx::ImageSkia(canvas.ExtractImageRep());
|
| @@ -298,8 +288,8 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
|
|
|
| base::string16 title =
|
| base::UTF8ToUTF16(WindowTypeShelfItem::GetTitle(type));
|
| - if (base::i18n::StringSearchIgnoringCaseAndAccents(
|
| - query, title, NULL, NULL)) {
|
| + if (base::i18n::StringSearchIgnoringCaseAndAccents(query, title, NULL,
|
| + NULL)) {
|
| model_->results()->Add(new ExampleSearchResult(type, query));
|
| }
|
| }
|
|
|