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

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

Issue 8298005: Fixes bug in instant where we would end up incorrectly using the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 years, 2 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_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/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 TabContentsWrapper* tab_contents); 101 TabContentsWrapper* tab_contents);
102 virtual void ShowCreateChromeAppShortcutsDialog(Profile* profile, 102 virtual void ShowCreateChromeAppShortcutsDialog(Profile* profile,
103 const Extension* app); 103 const Extension* app);
104 virtual void Cut(); 104 virtual void Cut();
105 virtual void Copy(); 105 virtual void Copy();
106 virtual void Paste(); 106 virtual void Paste();
107 virtual void OpenTabpose(); 107 virtual void OpenTabpose();
108 virtual void SetPresentationMode(bool presentation_mode); 108 virtual void SetPresentationMode(bool presentation_mode);
109 virtual bool InPresentationMode(); 109 virtual bool InPresentationMode();
110 virtual void ShowInstant(TabContentsWrapper* preview); 110 virtual void ShowInstant(TabContentsWrapper* preview);
111 virtual void HideInstant(bool instant_is_active); 111 virtual void HideInstant();
112 virtual gfx::Rect GetInstantBounds(); 112 virtual gfx::Rect GetInstantBounds();
113 virtual WindowOpenDisposition GetDispositionForPopupBounds( 113 virtual WindowOpenDisposition GetDispositionForPopupBounds(
114 const gfx::Rect& bounds); 114 const gfx::Rect& bounds);
115 virtual FindBar* CreateFindBar() OVERRIDE; 115 virtual FindBar* CreateFindBar() OVERRIDE;
116 virtual void ShowAvatarBubble(TabContents* tab_contents, 116 virtual void ShowAvatarBubble(TabContents* tab_contents,
117 const gfx::Rect& rect) OVERRIDE; 117 const gfx::Rect& rect) OVERRIDE;
118 118
119 // Overridden from NotificationObserver 119 // Overridden from NotificationObserver
120 virtual void Observe(int type, 120 virtual void Observe(int type,
121 const NotificationSource& source, 121 const NotificationSource& source,
(...skipping 15 matching lines...) Expand all
137 NotificationRegistrar registrar_; 137 NotificationRegistrar registrar_;
138 PrefChangeRegistrar pref_change_registrar_; 138 PrefChangeRegistrar pref_change_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 base::WeakPtrFactory<Browser> confirm_close_factory_; 141 base::WeakPtrFactory<Browser> confirm_close_factory_;
142 scoped_nsobject<NSString> pending_window_title_; 142 scoped_nsobject<NSString> pending_window_title_;
143 ui::WindowShowState initial_show_state_; 143 ui::WindowShowState initial_show_state_;
144 }; 144 };
145 145
146 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 146 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698