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

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

Issue 2034963002: Rename InkDropHover to InkDropHighlight (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gyp file Created 4 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_ICON_LABEL_BUBBLE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 virtual bool OnActivate(); 79 virtual bool OnActivate();
80 80
81 // views::View: 81 // views::View:
82 gfx::Size GetPreferredSize() const override; 82 gfx::Size GetPreferredSize() const override;
83 void Layout() override; 83 void Layout() override;
84 bool OnKeyPressed(const ui::KeyEvent& event) override; 84 bool OnKeyPressed(const ui::KeyEvent& event) override;
85 bool OnKeyReleased(const ui::KeyEvent& event) override; 85 bool OnKeyReleased(const ui::KeyEvent& event) override;
86 void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override; 86 void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
87 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; 87 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
88 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; 88 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
89 std::unique_ptr<views::InkDropHover> CreateInkDropHover() const override; 89 std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
90 const override;
90 SkColor GetInkDropBaseColor() const override; 91 SkColor GetInkDropBaseColor() const override;
91 92
92 const gfx::FontList& font_list() const { return label_->font_list(); } 93 const gfx::FontList& font_list() const { return label_->font_list(); }
93 94
94 SkColor GetParentBackgroundColor() const; 95 SkColor GetParentBackgroundColor() const;
95 96
96 gfx::Size GetSizeForLabelWidth(int label_width) const; 97 gfx::Size GetSizeForLabelWidth(int label_width) const;
97 98
98 // Returns the minimum width the view can be to show the complete image when 99 // Returns the minimum width the view can be to show the complete image when
99 // the background is showing. 100 // the background is showing.
(...skipping 29 matching lines...) Expand all
129 // the native theme (so it responds to native theme updates). TODO(estade): 130 // the native theme (so it responds to native theme updates). TODO(estade):
130 // remove when MD is default. 131 // remove when MD is default.
131 SkColor parent_background_color_; 132 SkColor parent_background_color_;
132 133
133 bool should_show_background_; 134 bool should_show_background_;
134 135
135 DISALLOW_COPY_AND_ASSIGN(IconLabelBubbleView); 136 DISALLOW_COPY_AND_ASSIGN(IconLabelBubbleView);
136 }; 137 };
137 138
138 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ 139 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698