chrome/browser/ui/views/frame/browser_frame_aura.h - Issue 11343028: Revert 164652 - speculative revert - this change may have caused print dialog test failures on XP.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11343028: Revert 164652 - speculative revert - this change may have caused print dialog test failures on XP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 1 month 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

OLD	NEW
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_FRAME_AURA_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_

6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_	6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "chrome/browser/ui/views/frame/native_browser_frame.h"	10 #include "chrome/browser/ui/views/frame/native_browser_frame.h"

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE;	46 virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE;

47 virtual void InitSystemContextMenu() OVERRIDE;	47 virtual void InitSystemContextMenu() OVERRIDE;

48 virtual int GetMinimizeButtonOffset() const OVERRIDE;	48 virtual int GetMinimizeButtonOffset() const OVERRIDE;

49 virtual void TabStripDisplayModeChanged() OVERRIDE;	49 virtual void TabStripDisplayModeChanged() OVERRIDE;

50	50

51 private:	51 private:

52 class WindowPropertyWatcher;	52 class WindowPropertyWatcher;

53	53

54 virtual ~BrowserFrameAura();	54 virtual ~BrowserFrameAura();

55	55

56 // Set the window into the auto managed mode.

57 void SetWindowAutoManaged();

58

59 // The BrowserView is our ClientView. This is a pointer to it.	56 // The BrowserView is our ClientView. This is a pointer to it.

60 BrowserView* browser_view_;	57 BrowserView* browser_view_;

61	58

62 scoped_ptr<WindowPropertyWatcher> window_property_watcher_;	59 scoped_ptr<WindowPropertyWatcher> window_property_watcher_;

63	60

64 // System menu.	61 // System menu.

65 scoped_ptr<views::MenuRunner> menu_runner_;	62 scoped_ptr<views::MenuRunner> menu_runner_;

66	63

67 DISALLOW_COPY_AND_ASSIGN(BrowserFrameAura);	64 DISALLOW_COPY_AND_ASSIGN(BrowserFrameAura);

68 };	65 };

69	66

70 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_	67 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_

OLD	NEW