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

Side by Side Diff: ash/common/wm/overview/window_selector_item.h

Issue 2618383004: Revert of Move more vector icons to respective directories and update code to (Closed)
Patch Set: Created 3 years, 11 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ 5 #ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
6 #define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ 6 #define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // An image button with a close window icon. 68 // An image button with a close window icon.
69 class OverviewCloseButton : public views::ImageButton { 69 class OverviewCloseButton : public views::ImageButton {
70 public: 70 public:
71 explicit OverviewCloseButton(views::ButtonListener* listener); 71 explicit OverviewCloseButton(views::ButtonListener* listener);
72 ~OverviewCloseButton() override; 72 ~OverviewCloseButton() override;
73 73
74 // Resets the listener so that the listener can go out of scope. 74 // Resets the listener so that the listener can go out of scope.
75 void ResetListener() { listener_ = nullptr; } 75 void ResetListener() { listener_ = nullptr; }
76 76
77 private: 77 private:
78 gfx::ImageSkia icon_image_;
79
78 DISALLOW_COPY_AND_ASSIGN(OverviewCloseButton); 80 DISALLOW_COPY_AND_ASSIGN(OverviewCloseButton);
79 }; 81 };
80 82
81 WindowSelectorItem(WmWindow* window, WindowSelector* window_selector); 83 WindowSelectorItem(WmWindow* window, WindowSelector* window_selector);
82 ~WindowSelectorItem() override; 84 ~WindowSelectorItem() override;
83 85
84 WmWindow* GetWindow(); 86 WmWindow* GetWindow();
85 87
86 // Returns the root window on which this item is shown. 88 // Returns the root window on which this item is shown.
87 WmWindow* root_window() { return root_window_; } 89 WmWindow* root_window() { return root_window_; }
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 // Pointer to a view that covers the original header and has rounded top 251 // Pointer to a view that covers the original header and has rounded top
250 // corners. This view can have its color and opacity animated. 252 // corners. This view can have its color and opacity animated.
251 RoundedContainerView* background_view_; 253 RoundedContainerView* background_view_;
252 254
253 DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem); 255 DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem);
254 }; 256 };
255 257
256 } // namespace ash 258 } // namespace ash
257 259
258 #endif // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ 260 #endif // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_popup_header_button.cc ('k') | ash/common/wm/overview/window_selector_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698