chrome/browser/ui/cocoa/browser_window_cocoa.h - Issue 7809013: Remove Animation When "Resuming" Window in Lion

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.h

Issue 7809013: Remove Animation When "Resuming" Window in Lion (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Adds context parameter to BrowserWindow::Show(...) Created 9 years, 3 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 | « chrome/browser/ui/cocoa/applescript/window_applescript.mm ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_COCOA_BROWSER_WINDOW_COCOA_H_	5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_

6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_	6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_

7 #pragma once	7 #pragma once

8	8

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

10 #include "base/task.h"	10 #include "base/task.h"

(...skipping 13 matching lines...) Expand all Loading...
24 // it needs to manipulate the window.	24 // it needs to manipulate the window.

25	25

26 class BrowserWindowCocoa : public BrowserWindow,	26 class BrowserWindowCocoa : public BrowserWindow,

27 public NotificationObserver {	27 public NotificationObserver {

28 public:	28 public:

29 BrowserWindowCocoa(Browser* browser,	29 BrowserWindowCocoa(Browser* browser,

30 BrowserWindowController* controller);	30 BrowserWindowController* controller);

31 virtual ~BrowserWindowCocoa();	31 virtual ~BrowserWindowCocoa();

32	32

33 // Overridden from BrowserWindow	33 // Overridden from BrowserWindow

34 virtual void Show();	34 virtual void Show(BrowserWindow::ShowContext show_context);

35 virtual void ShowInactive();	35 virtual void ShowInactive();

36 virtual void SetBounds(const gfx::Rect& bounds);	36 virtual void SetBounds(const gfx::Rect& bounds);

37 virtual void Close();	37 virtual void Close();

38 virtual void Activate();	38 virtual void Activate();

39 virtual void Deactivate();	39 virtual void Deactivate();

40 virtual bool IsActive() const;	40 virtual bool IsActive() const;

41 virtual void FlashFrame();	41 virtual void FlashFrame();

42 virtual gfx::NativeWindow GetNativeHandle();	42 virtual gfx::NativeWindow GetNativeHandle();

43 virtual BrowserWindowTesting* GetBrowserWindowTesting();	43 virtual BrowserWindowTesting* GetBrowserWindowTesting();

44 virtual StatusBubble* GetStatusBubble();	44 virtual StatusBubble* GetStatusBubble();

(...skipping 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
136 void UpdateSidebarForContents(TabContents* tab_contents);	136 void UpdateSidebarForContents(TabContents* tab_contents);

137	137

138 NotificationRegistrar registrar_;	138 NotificationRegistrar registrar_;

139 Browser* browser_; // weak, owned by controller	139 Browser* browser_; // weak, owned by controller

140 BrowserWindowController* controller_; // weak, owns us	140 BrowserWindowController* controller_; // weak, owns us

141 ScopedRunnableMethodFactory<Browser> confirm_close_factory_;	141 ScopedRunnableMethodFactory<Browser> confirm_close_factory_;

142 scoped_nsobject<NSString> pending_window_title_;	142 scoped_nsobject<NSString> pending_window_title_;

143 };	143 };

144	144

145 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_	145 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_

OLD	NEW