| Index: chrome/browser/views/sad_tab_view.h
|
| ===================================================================
|
| --- chrome/browser/views/sad_tab_view.h (revision 14343)
|
| +++ chrome/browser/views/sad_tab_view.h (working copy)
|
| @@ -39,8 +39,8 @@
|
|
|
| // Assorted resources for display.
|
| static SkBitmap* sad_tab_bitmap_;
|
| - static ChromeFont title_font_;
|
| - static ChromeFont message_font_;
|
| + static ChromeFont* title_font_;
|
| + static ChromeFont* message_font_;
|
| static std::wstring title_;
|
| static std::wstring message_;
|
| static int title_width_;
|
|
|
| Property changes on: chrome\browser\views\sad_tab_view.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /trunk/src/chrome/browser/views/sad_tab_view.h:r13773
|
| Merged /branches/chrome_webkit_merge_branch/chrome/browser/views/sad_tab_view.h:r69-2775
|
|
|
|
|