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

Unified Diff: ash/common/system/chromeos/palette/palette_tray.h

Issue 2148573002: Add palette tray to ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stylus-tool-structure
Patch Set: Pull parent CL changes Created 4 years, 5 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
Index: ash/common/system/chromeos/palette/palette_tray.h
diff --git a/ash/common/system/chromeos/palette/palette_tray.h b/ash/common/system/chromeos/palette/palette_tray.h
new file mode 100644
index 0000000000000000000000000000000000000000..74a63001a3f5da1a867e527c8ff69c743cc4dad6
--- /dev/null
+++ b/ash/common/system/chromeos/palette/palette_tray.h
@@ -0,0 +1,88 @@
+// 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_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
+
+#include <map>
+
+#include "ash/ash_export.h"
+#include "ash/common/session/session_state_observer.h"
+#include "ash/common/shell_observer.h"
+#include "ash/common/system/tray/tray_background_view.h"
+#include "base/macros.h"
+
+namespace views {
+class ImageView;
+class Widget;
+}
+
+namespace ash {
+
+class TrayBubbleWrapper;
+class PaletteToolManager;
+
+class ASH_EXPORT PaletteTray : public TrayBackgroundView,
+ public SessionStateObserver,
+ public ShellObserver,
+ public views::TrayBubbleView::Delegate {
+ public:
+ explicit PaletteTray(WmShelf* wm_shelf);
+ ~PaletteTray() override;
+
+ // ActionableView overrides.
oshima 2016/07/13 21:14:23 nit: // ActionableView: same for the rest.
jdufault 2016/07/18 20:44:02 Done.
+ bool PerformAction(const ui::Event& event) override;
+
+ // SessionStateObserver overrides.
+ void SessionStateChanged(SessionStateDelegate::SessionState state) override;
+
+ // TrayBackgroundView overrides.
+ void ClickedOutsideBubble() override;
+ base::string16 GetAccessibleNameForTray() override;
+ void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
+ void SetShelfAlignment(ShelfAlignment alignment) override;
+ void AnchorUpdated() override;
+
+ private:
+ // friend class OverviewButtonTrayTest;
oshima 2016/07/13 21:14:23 remove this?
jdufault 2016/07/18 20:44:02 Done.
+
+ // views::TrayBubbleView::Delegate:
+ void BubbleViewDestroyed() override;
+ void OnMouseEnteredView() override;
+ void OnMouseExitedView() override;
+ base::string16 GetAccessibleNameForBubble() override;
+ gfx::Rect GetAnchorRect(views::Widget* anchor_widget,
+ AnchorType anchor_type,
+ AnchorAlignment anchor_alignment) const override;
+ void OnBeforeBubbleWidgetInit(
+ views::Widget* anchor_widget,
+ views::Widget* bubble_widget,
+ views::Widget::InitParams* params) const override;
+ void HideBubble(const views::TrayBubbleView* bubble_view) override;
+
+ // Creates a new border for the icon. The padding is determined based on the
+ // alignment of the shelf.
+ void SetIconBorderForShelfAlignment();
+
+ // Updates the tray icon from the palette tool manager.
+ void UpdateTrayIcon();
+
+ // Sets the icon to visible if the palette can be used.
+ void UpdateIconVisibility();
+
+ bool OpenBubble();
+ void AddToolsToView(views::View* host);
+
+ std::unique_ptr<PaletteToolManager> palette_tool_manager_;
+ std::unique_ptr<TrayBubbleWrapper> bubble_;
oshima 2016/07/13 21:14:23 #include <memory>
jdufault 2016/07/18 20:44:02 Done.
+
+ // Weak pointer, will be parented by TrayContainer for its lifetime.
+ views::ImageView* icon_;
+
+ DISALLOW_COPY_AND_ASSIGN(PaletteTray);
+};
+
+} // namespace ash
+
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_

Powered by Google App Engine
This is Rietveld 408576698