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

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

Issue 1955583002: Second try at fixing location bar icon keyboard activation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 7 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 // padding before the label. 78 // padding before the label.
79 virtual int GetImageAndPaddingWidth() const; 79 virtual int GetImageAndPaddingWidth() const;
80 80
81 // The view has been activated by a user gesture such as spacebar. Returns 81 // The view has been activated by a user gesture such as spacebar. Returns
82 // true if some handling was performed. 82 // true if some handling was performed.
83 virtual bool OnActivate(); 83 virtual bool OnActivate();
84 84
85 // views::View: 85 // views::View:
86 gfx::Size GetPreferredSize() const override; 86 gfx::Size GetPreferredSize() const override;
87 void Layout() override; 87 void Layout() override;
88 bool OnKeyPressed(const ui::KeyEvent& event) override;
88 bool OnKeyReleased(const ui::KeyEvent& event) override; 89 bool OnKeyReleased(const ui::KeyEvent& event) override;
89 void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override; 90 void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
90 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; 91 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
91 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; 92 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
92 std::unique_ptr<views::InkDropHover> CreateInkDropHover() const override; 93 std::unique_ptr<views::InkDropHover> CreateInkDropHover() const override;
93 SkColor GetInkDropBaseColor() const override; 94 SkColor GetInkDropBaseColor() const override;
94 95
95 const gfx::FontList& font_list() const { return label_->font_list(); } 96 const gfx::FontList& font_list() const { return label_->font_list(); }
96 97
97 SkColor GetParentBackgroundColor() const; 98 SkColor GetParentBackgroundColor() const;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // the native theme (so it responds to native theme updates). TODO(estade): 133 // the native theme (so it responds to native theme updates). TODO(estade):
133 // remove when MD is default. 134 // remove when MD is default.
134 SkColor parent_background_color_; 135 SkColor parent_background_color_;
135 136
136 bool should_show_background_; 137 bool should_show_background_;
137 138
138 DISALLOW_COPY_AND_ASSIGN(IconLabelBubbleView); 139 DISALLOW_COPY_AND_ASSIGN(IconLabelBubbleView);
139 }; 140 };
140 141
141 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_ 142 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698