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

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h

Issue 11111022: Remove TabContents from constrained windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unrelated gtk code Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h
index 5ab8182baf75d17707551bbe27d3e54f1d85892a..1645c930753ab6db33f061be1fbdef7c9cf641af 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h
@@ -10,12 +10,14 @@
#include "base/memory/scoped_nsobject.h"
#include "chrome/browser/ui/constrained_window.h"
-class TabContents;
+namespace content {
+class WebContents;
+}
// Constrained window implementation for Mac.
class ConstrainedWindowMac2 : public ConstrainedWindow {
public:
- ConstrainedWindowMac2(TabContents* tab_contents, NSWindow* window);
+ ConstrainedWindowMac2(content::WebContents* web_contents, NSWindow* window);
// ConstrainedWindow implementation.
virtual void ShowConstrainedWindow() OVERRIDE;
@@ -31,7 +33,9 @@ class ConstrainedWindowMac2 : public ConstrainedWindow {
// Gets the parent window of the dialog.
NSWindow* GetParentWindow() const;
- TabContents* tab_contents_; // weak
+ // The WebContents that owns and constrains this ConstrainedWindow. Weak.
+ content::WebContents* web_contents_;
+
scoped_nsobject<NSWindow> window_;
};

Powered by Google App Engine
This is Rietveld 408576698