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

Unified Diff: chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.h

Issue 11418043: Remove TabContents from OmniboxEditController and friends. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros Created 8 years, 1 month 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/cocoa/location_bar/web_intents_button_decoration.h
diff --git a/chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.h b/chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.h
index e0f1eb1c7d32b232cc84f91634734281ef89e5d5..14c59be899632cc7a1e7482ec1da186b8402947c 100644
--- a/chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/web_intents_button_decoration.h
@@ -14,9 +14,12 @@
#include "chrome/browser/ui/cocoa/location_bar/bubble_decoration.h"
class LocationBarViewMac;
-class TabContents;
@class WebIntentsButtonAnimationState;
+namespace content {
+class WebContents;
+}
+
class WebIntentsButtonDecoration : public BubbleDecoration {
public:
WebIntentsButtonDecoration(LocationBarViewMac* owner, NSFont* font);
@@ -32,7 +35,7 @@ class WebIntentsButtonDecoration : public BubbleDecoration {
virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE;
// Optionally display the web intents button.
- void Update(TabContents* tab_contents);
+ void Update(content::WebContents* web_contents);
// Called from internal animator.
virtual void AnimationTimerFired();
@@ -50,11 +53,11 @@ class WebIntentsButtonDecoration : public BubbleDecoration {
// Used when the decoration has animated text.
scoped_nsobject<WebIntentsButtonAnimationState> animation_;
- CGFloat textWidth_;
- scoped_nsobject<NSAttributedString> animatedText_;
- scoped_nsobject<NSImage> leftImage_;
- scoped_nsobject<NSImage> centerImage_;
- scoped_nsobject<NSImage> rightImage_;
+ CGFloat text_width_;
+ scoped_nsobject<NSAttributedString> animated_text_;
+ scoped_nsobject<NSImage> left_image_;
+ scoped_nsobject<NSImage> center_image_;
+ scoped_nsobject<NSImage> right_image_;
DISALLOW_COPY_AND_ASSIGN(WebIntentsButtonDecoration);
};

Powered by Google App Engine
This is Rietveld 408576698