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

Unified Diff: chrome/browser/ui/cocoa/status_bubble_mac.h

Issue 7686015: ui: Pass the parameter |languages| of StatusBubble::SetURL() as std::string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add OVERRIDE Created 9 years, 4 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
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/status_bubble_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/status_bubble_mac.h
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.h b/chrome/browser/ui/cocoa/status_bubble_mac.h
index 861e84109faf1ff2408506480010abec5f661873..575a8373b6cf71605ff1edf9342d4ae7a9deb0e4 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac.h
+++ b/chrome/browser/ui/cocoa/status_bubble_mac.h
@@ -11,12 +11,12 @@
#import <Cocoa/Cocoa.h>
#import <QuartzCore/QuartzCore.h>
+#include "base/compiler_specific.h"
#include "base/string16.h"
#include "base/task.h"
#include "chrome/browser/ui/status_bubble.h"
#include "googleurl/src/gurl.h"
-class GURL;
class StatusBubbleMacTest;
class StatusBubbleMac : public StatusBubble {
@@ -36,11 +36,12 @@ class StatusBubbleMac : public StatusBubble {
virtual ~StatusBubbleMac();
// StatusBubble implementation.
- virtual void SetStatus(const string16& status);
- virtual void SetURL(const GURL& url, const string16& languages);
- virtual void Hide();
- virtual void MouseMoved(const gfx::Point& location, bool left_content);
- virtual void UpdateDownloadShelfVisibility(bool visible);
+ virtual void SetStatus(const string16& status) OVERRIDE;
+ virtual void SetURL(const GURL& url, const std::string& languages) OVERRIDE;
+ virtual void Hide() OVERRIDE;
+ virtual void MouseMoved(const gfx::Point& location,
+ bool left_content) OVERRIDE;
+ virtual void UpdateDownloadShelfVisibility(bool visible) OVERRIDE;
// Mac-specific method: Update the size and position of the status bubble to
// match the parent window. Safe to call even when the status bubble does not
@@ -174,7 +175,7 @@ class StatusBubbleMac : public StatusBubble {
// Needs to be passed to ElideURL if the original URL string is wider than
// the standard bubble width.
- string16 languages_;
+ std::string languages_;
DISALLOW_COPY_AND_ASSIGN(StatusBubbleMac);
};
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/status_bubble_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698