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

Unified Diff: chrome/browser/ui/toolbar/toolbar_model.h

Issue 200783003: [OriginChip] Add animations for the hiding and showing of the chip. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to comments, merge Created 6 years, 9 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/toolbar/toolbar_model.h
diff --git a/chrome/browser/ui/toolbar/toolbar_model.h b/chrome/browser/ui/toolbar/toolbar_model.h
index 4f1abc65f5a3b3c67443284031b000c00e84f8f8..c579c7b353b22d3e71044a5ce106158ccb48daca 100644
--- a/chrome/browser/ui/toolbar/toolbar_model.h
+++ b/chrome/browser/ui/toolbar/toolbar_model.h
@@ -31,15 +31,21 @@ class ToolbarModel {
virtual ~ToolbarModel();
- // Returns the text for the current page's URL. This will have been formatted
- // for display to the user:
- // - Some characters may be unescaped.
- // - The scheme and/or trailing slash may be dropped.
+ // Returns the text to be displayed in the toolbar for the current page.
+ // The text is formatted in various ways:
// - If the current page's URL is a search URL for the user's default search
// engine, the query will be extracted and returned for display instead
// of the URL.
+ // - If the origin chip is enabled and visible, the text will be empty.
Peter Kasting 2014/03/21 21:22:10 Nit: Indenting doesn't match above (2 places)
Justin Donnelly 2014/03/24 22:59:37 Done.
+ // - Otherwise, the text will contain the URL returned by GetFormattedURL().
virtual base::string16 GetText() const = 0;
+ // Returns a formatted URL for display in the toolbar. The formatting
+ // includes:
+ // - Some characters may be unescaped.
+ // - The scheme and/or trailing slash may be dropped.
+ virtual base::string16 GetFormattedURL() const = 0;
+
// Some search URLs bundle a special "corpus" param that we can extract and
// display next to users' search terms in cases where we'd show the search
// terms instead of the URL anyway. For example, a Google image search might

Powered by Google App Engine
This is Rietveld 408576698