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

Side by Side Diff: ash/system/tray/tray_popup_header_button.h

Issue 2901503003: Rename GetPreferredSize to CalculatePreferredSize in ash/ (Closed)
Patch Set: improvements Created 3 years, 7 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 | « ash/system/tray/tray_item_view.cc ('k') | ash/system/tray/tray_popup_header_button.cc » ('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 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_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_
6 #define ASH_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/views/controls/button/image_button.h" 10 #include "ui/views/controls/button/image_button.h"
(...skipping 13 matching lines...) Expand all
24 int enabled_resource_id, 24 int enabled_resource_id,
25 int disabled_resource_id, 25 int disabled_resource_id,
26 int enabled_resource_id_hover, 26 int enabled_resource_id_hover,
27 int disabled_resource_id_hover, 27 int disabled_resource_id_hover,
28 int accessible_name_id); 28 int accessible_name_id);
29 ~TrayPopupHeaderButton() override; 29 ~TrayPopupHeaderButton() override;
30 30
31 private: 31 private:
32 // Overridden from views::View: 32 // Overridden from views::View:
33 const char* GetClassName() const override; 33 const char* GetClassName() const override;
34 gfx::Size GetPreferredSize() const override; 34 gfx::Size CalculatePreferredSize() const override;
35 35
36 // Overridden from views::CustomButton: 36 // Overridden from views::CustomButton:
37 void StateChanged(ButtonState old_state) override; 37 void StateChanged(ButtonState old_state) override;
38 38
39 void Initialize(const gfx::ImageSkia& icon, int accessible_name_id); 39 void Initialize(const gfx::ImageSkia& icon, int accessible_name_id);
40 40
41 DISALLOW_COPY_AND_ASSIGN(TrayPopupHeaderButton); 41 DISALLOW_COPY_AND_ASSIGN(TrayPopupHeaderButton);
42 }; 42 };
43 43
44 } // namespace ash 44 } // namespace ash
45 45
46 #endif // ASH_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_ 46 #endif // ASH_SYSTEM_TRAY_TRAY_POPUP_HEADER_BUTTON_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_item_view.cc ('k') | ash/system/tray/tray_popup_header_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698