diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 05:29:27 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 05:29:27 +0000 |
| commit | 4c4d8d2b8aa8ae394d0f933700ddd9e682b141af (patch) | |
| tree | 6e3e10e71c29bb9cc8d221d4de38d9dc603e32cd /chrome/browser/views/tab_icon_view.h | |
| parent | 39d74d8b3c05faf98935927b68eaebb9a23a76a4 (diff) | |
| download | chromium_src-4c4d8d2b8aa8ae394d0f933700ddd9e682b141af.zip chromium_src-4c4d8d2b8aa8ae394d0f933700ddd9e682b141af.tar.gz chromium_src-4c4d8d2b8aa8ae394d0f933700ddd9e682b141af.tar.bz2 | |
Convert NavigationEntry title to string16. TabContents::GetTitle no longer needs
to be virtual, either.
This also changes how the display URL is computed. Instead of doing it
preemptively, we now do so lazily. This allows us to do the URL formatting
correctly using the elider so that we can do IDN and unescaping.
I changed string_util's singleton functions. I was worried that other code
might make a singleton of string, which would give you this same value as a
non-const string. This would mean our empty strings might no longer be empty.
Review URL: http://codereview.chromium.org/39022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tab_icon_view.h')
| -rw-r--r-- | chrome/browser/views/tab_icon_view.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/views/tab_icon_view.h b/chrome/browser/views/tab_icon_view.h index 3a731fc..d210ba4 100644 --- a/chrome/browser/views/tab_icon_view.h +++ b/chrome/browser/views/tab_icon_view.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H__ -#define CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H__ +#ifndef CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H_ +#define CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H_ #include "chrome/views/view.h" @@ -66,8 +66,7 @@ class TabIconView : public views::View { // throbber_running_ is true. int throbber_frame_; - DISALLOW_EVIL_CONSTRUCTORS(TabIconView); + DISALLOW_COPY_AND_ASSIGN(TabIconView); }; -#endif // CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H__ - +#endif // CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H_ |