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

Unified Diff: chrome/browser/ui/views/status_bubble_views.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/status_bubble.h ('k') | chrome/browser/ui/views/status_bubble_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/status_bubble_views.h
diff --git a/chrome/browser/ui/views/status_bubble_views.h b/chrome/browser/ui/views/status_bubble_views.h
index 9779296c066593aaea7a62032d61ac89c689f492..9c55b56bbbb4f37f11ee714ba7c456333c23925e 100644
--- a/chrome/browser/ui/views/status_bubble_views.h
+++ b/chrome/browser/ui/views/status_bubble_views.h
@@ -7,6 +7,7 @@
#pragma once
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "base/task.h"
@@ -14,7 +15,6 @@
#include "googleurl/src/gurl.h"
#include "ui/gfx/rect.h"
-class GURL;
namespace gfx {
class Point;
}
@@ -55,11 +55,12 @@ class StatusBubbleViews : public StatusBubble {
void SetBubbleWidth(int width);
// Overridden from StatusBubble:
- 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;
private:
class StatusView;
@@ -98,7 +99,7 @@ class StatusBubbleViews : public StatusBubble {
GURL url_;
// Used to elide the original URL again when we expand it.
- string16 languages_;
+ std::string languages_;
// Position relative to the base_view_.
gfx::Point original_position_;
« no previous file with comments | « chrome/browser/ui/status_bubble.h ('k') | chrome/browser/ui/views/status_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698