diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 22:40:33 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 22:40:33 +0000 |
| commit | f51c70c9383a6701d08445b3ca2482195997fdec (patch) | |
| tree | 11d4f94300c8d983c9d160f2fc73a5f6c24645d6 | |
| parent | 11be6a681bbf17383ee53105e7e7b2edfd52ade4 (diff) | |
| download | chromium_src-f51c70c9383a6701d08445b3ca2482195997fdec.zip chromium_src-f51c70c9383a6701d08445b3ca2482195997fdec.tar.gz chromium_src-f51c70c9383a6701d08445b3ca2482195997fdec.tar.bz2 | |
Fix compile errors introduced by CL 145206 for bug 133103. Checking in the missing
browser_frame_win.h file and fixing the member initialization order compile error in OpaqueBrowserFrameView.
BUG=133103
TBR=ben
Review URL: https://chromiumcodereview.appspot.com/10699064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145209 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_frame_win.h | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.h b/chrome/browser/ui/views/frame/browser_frame_win.h index d1525c2..902cb71 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.h +++ b/chrome/browser/ui/views/frame/browser_frame_win.h @@ -61,6 +61,7 @@ class BrowserFrameWin : public views::NativeWidgetWin, virtual void ShowWithWindowState(ui::WindowShowState show_state) OVERRIDE; virtual void Close() OVERRIDE; virtual void OnActivate(UINT action, BOOL minimized, HWND window) OVERRIDE; + virtual void FrameTypeChanged() OVERRIDE; // Overridden from NativeBrowserFrame: virtual views::NativeWidget* AsNativeWidget() OVERRIDE; diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 0c25767..c8afe3a 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -133,11 +133,11 @@ bool ShouldAddDefaultCaptionButtons() { OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view) : BrowserNonClientFrameView(frame, browser_view), - window_icon_(NULL), minimize_button_(NULL), maximize_button_(NULL), restore_button_(NULL), close_button_(NULL), + window_icon_(NULL), frame_background_(new views::FrameBackground()) { if (ShouldAddDefaultCaptionButtons()) { minimize_button_ = InitWindowCaptionButton(IDR_MINIMIZE, |