Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame_win.h

Issue 6975037: Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "chrome/browser/ui/views/frame/browser_frame.h" 10 #include "chrome/browser/ui/views/frame/browser_frame.h"
(...skipping 25 matching lines...) Expand all
36 // Overridden from views::WindowWin: 36 // Overridden from views::WindowWin:
37 virtual int GetShowState() const OVERRIDE; 37 virtual int GetShowState() const OVERRIDE;
38 virtual gfx::Insets GetClientAreaInsets() const OVERRIDE; 38 virtual gfx::Insets GetClientAreaInsets() const OVERRIDE;
39 virtual void UpdateFrameAfterFrameChange() OVERRIDE; 39 virtual void UpdateFrameAfterFrameChange() OVERRIDE;
40 virtual void OnEndSession(BOOL ending, UINT logoff) OVERRIDE; 40 virtual void OnEndSession(BOOL ending, UINT logoff) OVERRIDE;
41 virtual void OnInitMenuPopup(HMENU menu, 41 virtual void OnInitMenuPopup(HMENU menu,
42 UINT position, 42 UINT position,
43 BOOL is_system_menu) OVERRIDE; 43 BOOL is_system_menu) OVERRIDE;
44 virtual void OnWindowPosChanged(WINDOWPOS* window_pos) OVERRIDE; 44 virtual void OnWindowPosChanged(WINDOWPOS* window_pos) OVERRIDE;
45 virtual void OnScreenReaderDetected() OVERRIDE; 45 virtual void OnScreenReaderDetected() OVERRIDE;
46 virtual bool ShouldUseNativeFrame() const OVERRIDE;
47 46
48 // Overridden from NativeBrowserFrame: 47 // Overridden from NativeBrowserFrame:
49 virtual views::NativeWindow* AsNativeWindow() OVERRIDE; 48 virtual views::NativeWindow* AsNativeWindow() OVERRIDE;
50 virtual const views::NativeWindow* AsNativeWindow() const OVERRIDE; 49 virtual const views::NativeWindow* AsNativeWindow() const OVERRIDE;
51 virtual int GetMinimizeButtonOffset() const OVERRIDE; 50 virtual int GetMinimizeButtonOffset() const OVERRIDE;
52 virtual void TabStripDisplayModeChanged() OVERRIDE; 51 virtual void TabStripDisplayModeChanged() OVERRIDE;
53 52
54 private: 53 private:
55 // Updates the DWM with the frame bounds. 54 // Updates the DWM with the frame bounds.
56 void UpdateDWMFrame(); 55 void UpdateDWMFrame();
57 56
58 // The BrowserView is our ClientView. This is a pointer to it. 57 // The BrowserView is our ClientView. This is a pointer to it.
59 BrowserView* browser_view_; 58 BrowserView* browser_view_;
60 59
61 BrowserFrame* browser_frame_; 60 BrowserFrame* browser_frame_;
62 61
63 DISALLOW_COPY_AND_ASSIGN(BrowserFrameWin); 62 DISALLOW_COPY_AND_ASSIGN(BrowserFrameWin);
64 }; 63 };
65 64
66 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_ 65 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame.cc ('k') | chrome/browser/ui/views/frame/browser_frame_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698