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

Side by Side Diff: ui/app_list/views/all_apps_tile_item_view.cc

Issue 2934673002: Revert of Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « ui/app_list/views/all_apps_tile_item_view.h ('k') | ui/app_list/views/app_list_main_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/views/all_apps_tile_item_view.h" 5 #include "ui/app_list/views/all_apps_tile_item_view.h"
6 6
7 #include "base/metrics/histogram_macros.h" 7 #include "base/metrics/histogram_macros.h"
8 #include "ui/app_list/app_list_constants.h" 8 #include "ui/app_list/app_list_constants.h"
9 #include "ui/app_list/app_list_features.h"
10 #include "ui/app_list/resources/grit/app_list_resources.h" 9 #include "ui/app_list/resources/grit/app_list_resources.h"
11 #include "ui/app_list/views/app_list_view.h"
12 #include "ui/app_list/views/contents_view.h" 10 #include "ui/app_list/views/contents_view.h"
13 #include "ui/base/l10n/l10n_util.h" 11 #include "ui/base/l10n/l10n_util.h"
14 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/gfx/canvas.h" 13 #include "ui/gfx/canvas.h"
16 #include "ui/gfx/image/canvas_image_source.h" 14 #include "ui/gfx/image/canvas_image_source.h"
17 #include "ui/strings/grit/ui_strings.h" 15 #include "ui/strings/grit/ui_strings.h"
18 16
19 namespace app_list { 17 namespace app_list {
20 18
21 namespace { 19 namespace {
(...skipping 11 matching lines...) Expand all
33 (size().height() - icon_.size().height()) / 2); 31 (size().height() - icon_.size().height()) / 2);
34 } 32 }
35 33
36 gfx::ImageSkia icon_; 34 gfx::ImageSkia icon_;
37 35
38 DISALLOW_COPY_AND_ASSIGN(AllAppsImageSource); 36 DISALLOW_COPY_AND_ASSIGN(AllAppsImageSource);
39 }; 37 };
40 38
41 } // namespace 39 } // namespace
42 40
43 AllAppsTileItemView::AllAppsTileItemView(ContentsView* contents_view, 41 AllAppsTileItemView::AllAppsTileItemView(ContentsView* contents_view)
44 AppListView* app_list_view) 42 : contents_view_(contents_view) {
45 : contents_view_(contents_view), app_list_view_(app_list_view) {
46 SetTitle(l10n_util::GetStringUTF16(IDS_APP_LIST_ALL_APPS)); 43 SetTitle(l10n_util::GetStringUTF16(IDS_APP_LIST_ALL_APPS));
47 SetHoverStyle(TileItemView::HOVER_STYLE_ANIMATE_SHADOW); 44 SetHoverStyle(TileItemView::HOVER_STYLE_ANIMATE_SHADOW);
48 UpdateIcon(); 45 UpdateIcon();
49 } 46 }
50 47
51 AllAppsTileItemView::~AllAppsTileItemView() { 48 AllAppsTileItemView::~AllAppsTileItemView() {
52 } 49 }
53 50
54 void AllAppsTileItemView::UpdateIcon() { 51 void AllAppsTileItemView::UpdateIcon() {
55 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 52 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
56 gfx::Size canvas_size = gfx::Size(kTileIconSize, kTileIconSize); 53 gfx::Size canvas_size = gfx::Size(kTileIconSize, kTileIconSize);
57 AllAppsImageSource* source = new AllAppsImageSource( 54 AllAppsImageSource* source = new AllAppsImageSource(
58 *rb.GetImageNamed(IDR_ALL_APPS_DROP_DOWN).ToImageSkia(), canvas_size); 55 *rb.GetImageNamed(IDR_ALL_APPS_DROP_DOWN).ToImageSkia(), canvas_size);
59 gfx::ImageSkia image(source, canvas_size); 56 gfx::ImageSkia image(source, canvas_size);
60 57
61 SetIcon(image); 58 SetIcon(image);
62 } 59 }
63 60
64 void AllAppsTileItemView::ButtonPressed(views::Button* sender, 61 void AllAppsTileItemView::ButtonPressed(views::Button* sender,
65 const ui::Event& event) { 62 const ui::Event& event) {
66 UMA_HISTOGRAM_ENUMERATION(kPageOpenedHistogram, AppListModel::STATE_APPS, 63 UMA_HISTOGRAM_ENUMERATION(kPageOpenedHistogram, AppListModel::STATE_APPS,
67 AppListModel::STATE_LAST); 64 AppListModel::STATE_LAST);
68 65
69 contents_view_->SetActiveState(AppListModel::STATE_APPS); 66 contents_view_->SetActiveState(AppListModel::STATE_APPS);
70 if (features::IsFullscreenAppListEnabled())
71 app_list_view_->SetState(AppListView::FULLSCREEN);
72 } 67 }
73 68
74 } // namespace app_list 69 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/all_apps_tile_item_view.h ('k') | ui/app_list/views/app_list_main_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698