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

Side by Side Diff: chrome/browser/ui/views/location_bar/bubble_icon_view.h

Issue 1724963002: Color the ink drop ripple and hover effects based on theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sky review Created 4 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 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 CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_BUBBLE_ICON_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_BUBBLE_ICON_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_BUBBLE_ICON_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_BUBBLE_ICON_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/gfx/image/image_skia.h" 10 #include "ui/gfx/image/image_skia.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 void GetAccessibleState(ui::AXViewState* state) override; 57 void GetAccessibleState(ui::AXViewState* state) override;
58 bool GetTooltipText(const gfx::Point& p, base::string16* tooltip) const 58 bool GetTooltipText(const gfx::Point& p, base::string16* tooltip) const
59 override; 59 override;
60 gfx::Size GetPreferredSize() const override; 60 gfx::Size GetPreferredSize() const override;
61 void Layout() override; 61 void Layout() override;
62 bool OnMousePressed(const ui::MouseEvent& event) override; 62 bool OnMousePressed(const ui::MouseEvent& event) override;
63 void OnMouseReleased(const ui::MouseEvent& event) override; 63 void OnMouseReleased(const ui::MouseEvent& event) override;
64 bool OnKeyPressed(const ui::KeyEvent& event) override; 64 bool OnKeyPressed(const ui::KeyEvent& event) override;
65 void ViewHierarchyChanged( 65 void ViewHierarchyChanged(
66 const ViewHierarchyChangedDetails& details) override; 66 const ViewHierarchyChangedDetails& details) override;
67 void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
67 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; 68 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
68 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; 69 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
69 scoped_ptr<views::InkDropHover> CreateInkDropHover() const override; 70 scoped_ptr<views::InkDropHover> CreateInkDropHover() const override;
70 void OnNativeThemeChanged(const ui::NativeTheme* theme) override; 71 SkColor GetInkDropBaseColor() const override;
71 72
72 // ui::EventHandler: 73 // ui::EventHandler:
73 void OnGestureEvent(ui::GestureEvent* event) override; 74 void OnGestureEvent(ui::GestureEvent* event) override;
74 75
75 // views::WidgetObserver: 76 // views::WidgetObserver:
76 void OnWidgetDestroying(views::Widget* widget) override; 77 void OnWidgetDestroying(views::Widget* widget) override;
77 void OnWidgetVisibilityChanged(views::Widget* widget, 78 void OnWidgetVisibilityChanged(views::Widget* widget,
78 bool visible) override; 79 bool visible) override;
79 80
80 protected: 81 protected:
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // prevent the bubble from reshowing. 126 // prevent the bubble from reshowing.
126 bool suppress_mouse_released_action_; 127 bool suppress_mouse_released_action_;
127 128
128 // Animation delegate for the ink drop ripple effect. 129 // Animation delegate for the ink drop ripple effect.
129 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; 130 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;
130 131
131 DISALLOW_COPY_AND_ASSIGN(BubbleIconView); 132 DISALLOW_COPY_AND_ASSIGN(BubbleIconView);
132 }; 133 };
133 134
134 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_BUBBLE_ICON_VIEW_H_ 135 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_BUBBLE_ICON_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bar_control_button.cc ('k') | chrome/browser/ui/views/location_bar/bubble_icon_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698