| Index: chrome/views/window/dialog_client_view.h
|
| ===================================================================
|
| --- chrome/views/window/dialog_client_view.h (revision 14343)
|
| +++ chrome/views/window/dialog_client_view.h (working copy)
|
| @@ -113,7 +113,7 @@
|
|
|
| // Static resource initialization
|
| static void InitClass();
|
| - static ChromeFont dialog_button_font_;
|
| + static ChromeFont* dialog_button_font_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DialogClientView);
|
| };
|
|
|
| Property changes on: chrome\views\window\dialog_client_view.h
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Merged /trunk/src/chrome/views/window/dialog_client_view.h:r13773
|
|
|
|
|