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

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

Issue 12257014: Revert 182281 - Broke Chome Frame tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
7 7
8 #include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" 8 #include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h"
9 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h" 9 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h"
10 #include "chrome/browser/ui/views/frame/minimize_button_metrics_win.h" 10 #include "chrome/browser/ui/views/frame/minimize_button_metrics_win.h"
(...skipping 30 matching lines...) Expand all
41 virtual bool GetClientAreaInsets(gfx::Insets* insets) const OVERRIDE; 41 virtual bool GetClientAreaInsets(gfx::Insets* insets) const OVERRIDE;
42 virtual void HandleFrameChanged() OVERRIDE; 42 virtual void HandleFrameChanged() OVERRIDE;
43 virtual bool PreHandleMSG(UINT message, 43 virtual bool PreHandleMSG(UINT message,
44 WPARAM w_param, 44 WPARAM w_param,
45 LPARAM l_param, 45 LPARAM l_param,
46 LRESULT* result) OVERRIDE; 46 LRESULT* result) OVERRIDE;
47 virtual void PostHandleMSG(UINT message, 47 virtual void PostHandleMSG(UINT message,
48 WPARAM w_param, 48 WPARAM w_param,
49 LPARAM l_param) OVERRIDE; 49 LPARAM l_param) OVERRIDE;
50 virtual bool IsUsingCustomFrame() const OVERRIDE; 50 virtual bool IsUsingCustomFrame() const OVERRIDE;
51 virtual bool ShouldUseNativeFrame() OVERRIDE;
52 51
53 void UpdateDWMFrame(); 52 void UpdateDWMFrame();
54 53
55 BrowserView* browser_view_; 54 BrowserView* browser_view_;
56 BrowserFrame* browser_frame_; 55 BrowserFrame* browser_frame_;
57 56
58 MinimizeButtonMetrics minimize_button_metrics_; 57 MinimizeButtonMetrics minimize_button_metrics_;
59 58
60 // The wrapped system menu itself. 59 // The wrapped system menu itself.
61 scoped_ptr<views::NativeMenuWin> system_menu_; 60 scoped_ptr<views::NativeMenuWin> system_menu_;
62 61
63 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopRootWindowHostWin); 62 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopRootWindowHostWin);
64 }; 63 };
65 64
66 65
67 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_ 66 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698