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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_decoration_view.h

Issue 10917280: Fix up views web intents location bar decoration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Correct pixel spacing Created 8 years, 3 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: chrome/browser/ui/views/location_bar/location_bar_decoration_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h
index 9445fb6f824f73174ee7084b623693d0a0769dc6..cc957ddba732fa5b18569db307c908ae55a1a6de 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h
@@ -12,6 +12,7 @@
#include "chrome/common/content_settings_types.h"
#include "ui/base/animation/animation_delegate.h"
#include "ui/base/events/event.h"
+#include "ui/gfx/font.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/painter.h"
@@ -60,6 +61,10 @@ class LocationBarDecorationView : public views::ImageView,
// TouchableLocationBarView.
virtual int GetBuiltInHorizontalPadding() const OVERRIDE;
+ // Set the font to be used for drawing the label.
+ void SetFont(const gfx::Font& font);
+ void SetFontColor(SkColor color);
+
protected:
// Invoked when the user clicks on the control.
virtual void OnClick(LocationBarView* parent) = 0;
@@ -80,6 +85,7 @@ class LocationBarDecorationView : public views::ImageView,
virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+
virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
// Notify the possibly-running animation that it was clicked.
@@ -90,6 +96,8 @@ class LocationBarDecorationView : public views::ImageView,
scoped_ptr<ui::SlideAnimation> slide_animator_;
string16 animated_text_;
+ gfx::Font font_;
+ SkColor font_color_;
bool pause_animation_;
double pause_animation_state_;
int text_size_;

Powered by Google App Engine
This is Rietveld 408576698