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

Unified Diff: ash/common/system/tray/system_menu_button.h

Issue 2734653002: chromeos: Move files in //ash/common to //ash (Closed)
Patch Set: fix a11y tests, fix docs Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/tray/special_popup_row.cc ('k') | ash/common/system/tray/system_menu_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_menu_button.h
diff --git a/ash/common/system/tray/system_menu_button.h b/ash/common/system/tray/system_menu_button.h
deleted file mode 100644
index 78026f0dccc68ae1efd9c5fcf37911290c14f680..0000000000000000000000000000000000000000
--- a/ash/common/system/tray/system_menu_button.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_MENU_BUTTON_H_
-#define ASH_COMMON_SYSTEM_TRAY_SYSTEM_MENU_BUTTON_H_
-
-#include "ash/common/system/tray/tray_popup_ink_drop_style.h"
-#include "ash/resources/vector_icons/vector_icons.h"
-#include "base/macros.h"
-#include "base/optional.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/views/controls/button/button.h"
-#include "ui/views/controls/button/image_button.h"
-
-namespace ash {
-
-// A 48x48 image button with a material design ripple effect, which can be
-// used across Ash material design native UI menus.
-// TODO(tdanderson): Deprecate TrayPopupHeaderButton in favor of
-// SystemMenuButton once material design is enabled by default. See
-// crbug.com/614453.
-class SystemMenuButton : public views::ImageButton {
- public:
- // Constructs the button with |listener| and a centered icon corresponding to
- // |normal_icon| when button is enabled and |disabled_icon| when it is
- // disabled. |ink_drop_style| specifies which flavor of the ink drop should be
- // used. |accessible_name_id| corresponds to the string in ui::ResourceBundle
- // to use for the button's accessible and tooltip text.
- SystemMenuButton(views::ButtonListener* listener,
- TrayPopupInkDropStyle ink_drop_style,
- gfx::ImageSkia normal_icon,
- gfx::ImageSkia disabled_icon,
- int accessible_name_id);
-
- // Similar to the above constructor. Just gets a single vector icon and
- // creates the normal and disabled icons based on that using default menu icon
- // colors.
- SystemMenuButton(views::ButtonListener* listener,
- TrayPopupInkDropStyle ink_drop_style,
- const gfx::VectorIcon& icon,
- int accessible_name_id);
- ~SystemMenuButton() override;
-
- // Explicity sets the ink drop color. Otherwise the default value will be used
- // by TrayPopupUtils::CreateInkDropRipple() and
- // TrayPopupUtils::CreateInkDropHighlight().
- void SetInkDropColor(SkColor color);
-
- // views::ImageButton:
- std::unique_ptr<views::InkDrop> CreateInkDrop() override;
- std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
- std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
- const override;
- std::unique_ptr<views::InkDropMask> CreateInkDropMask() const override;
-
- private:
- // Returns the size that the ink drop should be constructed with.
- gfx::Size GetInkDropSize() const;
-
- // Defines the flavor of ink drop ripple/highlight that should be constructed.
- TrayPopupInkDropStyle ink_drop_style_;
-
- // The color to use when creating the ink drop. If null the default color is
- // used as defined by TrayPopupUtils::CreateInkDropRipple() and
- // TrayPopupUtils::CreateInkDropHighlight().
- base::Optional<SkColor> ink_drop_color_;
-
- DISALLOW_COPY_AND_ASSIGN(SystemMenuButton);
-};
-
-} // namespace ash
-
-#endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_MENU_BUTTON_H_
« no previous file with comments | « ash/common/system/tray/special_popup_row.cc ('k') | ash/common/system/tray/system_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698