| Index: chrome/browser/views/frame/opaque_browser_frame_view.h
|
| ===================================================================
|
| --- chrome/browser/views/frame/opaque_browser_frame_view.h (revision 14343)
|
| +++ chrome/browser/views/frame/opaque_browser_frame_view.h (working copy)
|
| @@ -158,7 +158,7 @@
|
| static views::WindowResources* inactive_resources_;
|
| static views::WindowResources* active_otr_resources_;
|
| static views::WindowResources* inactive_otr_resources_;
|
| - static ChromeFont title_font_;
|
| + static ChromeFont* title_font_;
|
|
|
| DISALLOW_EVIL_CONSTRUCTORS(OpaqueBrowserFrameView);
|
| };
|
|
|
| Property changes on: chrome\browser\views\frame\opaque_browser_frame_view.h
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Merged /trunk/src/chrome/browser/views/frame/opaque_browser_frame_view.h:r13773
|
|
|
|
|