Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 // The view has been activated by a user gesture such as spacebar. Returns | 66 // The view has been activated by a user gesture such as spacebar. Returns |
| 67 // true if some handling was performed. | 67 // true if some handling was performed. |
| 68 virtual bool OnActivate(const ui::Event& event); | 68 virtual bool OnActivate(const ui::Event& event); |
| 69 | 69 |
| 70 // views::View: | 70 // views::View: |
| 71 gfx::Size GetPreferredSize() const override; | 71 gfx::Size GetPreferredSize() const override; |
| 72 void Layout() override; | 72 void Layout() override; |
| 73 bool OnKeyPressed(const ui::KeyEvent& event) override; | 73 bool OnKeyPressed(const ui::KeyEvent& event) override; |
| 74 bool OnKeyReleased(const ui::KeyEvent& event) override; | 74 bool OnKeyReleased(const ui::KeyEvent& event) override; |
| 75 void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override; | 75 void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override; |
| 76 void GetAccessibleNodeData(ui::AXNodeData* node_data) override; | |
|
Peter Kasting
2016/12/06 04:20:28
Nit: This goes above OnNativeThemeChanged (match s
Patti Lor
2016/12/06 07:07:21
Thanks for picking that up, fixed!
| |
| 77 | |
| 78 // views::InkDropHostView: | |
|
Peter Kasting
2016/12/06 04:20:28
Nit: Don't add this separate divider, instead rewo
Patti Lor
2016/12/06 07:07:21
Done.
| |
| 76 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; | 79 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; |
| 77 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; | 80 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; |
| 78 std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight() | 81 std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight() |
| 79 const override; | 82 const override; |
| 80 SkColor GetInkDropBaseColor() const override; | 83 SkColor GetInkDropBaseColor() const override; |
| 81 | 84 |
| 82 const gfx::FontList& font_list() const { return label_->font_list(); } | 85 const gfx::FontList& font_list() const { return label_->font_list(); } |
| 83 | 86 |
| 84 SkColor GetParentBackgroundColor() const; | 87 SkColor GetParentBackgroundColor() const; |
| 85 | 88 |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 104 void OnPaint(gfx::Canvas* canvas) override; | 107 void OnPaint(gfx::Canvas* canvas) override; |
| 105 | 108 |
| 106 // The contents of the bubble. | 109 // The contents of the bubble. |
| 107 views::ImageView* image_; | 110 views::ImageView* image_; |
| 108 views::Label* label_; | 111 views::Label* label_; |
| 109 | 112 |
| 110 DISALLOW_COPY_AND_ASSIGN(IconLabelBubbleView); | 113 DISALLOW_COPY_AND_ASSIGN(IconLabelBubbleView); |
| 111 }; | 114 }; |
| 112 | 115 |
| 113 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ | 116 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ |
| OLD | NEW |