Implement fullscreen info bubble on Win and Mac

chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h

Index: chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h
diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h
index 07dfc1a785e313c9954beacdcc7c4c74aab04b3b..546bef1f743d89aa15f29eee5827af9dbd4d267b 100644
--- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h
@@ -8,22 +8,33 @@
 #include "base/memory/scoped_nsobject.h"
 #include "googleurl/src/gurl.h"
 
-@class AnimatableView;
 class TabContentsWrapper;
 @class BrowserWindowController;
 class Browser;
+@class GTMUILocalizerAndLayoutTweaker;
+
+namespace fullscreen_exit_bubble {
+const int kBubbleOffsetY = 10;
+} // namespace fullscreen_exit_bubble

[Scott Hess - ex-Googler, 2011/10/13 20:30:27]

I don't really get why you have this out here, rather than as an anonymous
namespace in the .mm file?

[koz (OOO until 15th September), 2011/10/14 00:35:16]

Done.

 
 // The FullscreenExitBubbleController manages the bubble that tells the user
 // how to escape fullscreen mode. The bubble only appears when a tab requests
 // fullscreen mode via webkitRequestFullScreen().
 @interface FullscreenExitBubbleController :
-    NSViewController<NSTextViewDelegate, NSAnimationDelegate> {
+    NSWindowController<NSTextViewDelegate, NSAnimationDelegate> {
  @private
   BrowserWindowController* owner_;  // weak
   Browser* browser_; // weak
+  GURL url_;
+  BOOL showButtons_;
 
  @protected
   IBOutlet NSTextField* exitLabelPlaceholder_;
+  IBOutlet NSTextField* messageLabel_;
+  IBOutlet NSButton* allowButton_;
+  IBOutlet NSButton* denyButton_;
+  IBOutlet InfoBubbleView* bubble_;
+  IBOutlet GTMUILocalizerAndLayoutTweaker* tweaker_;
 
   // Text fields don't work as well with embedded links as text views, but
   // text views cannot conveniently be created in IB. The xib file contains
@@ -35,12 +46,20 @@ class Browser;
   scoped_nsobject<NSAnimation> hideAnimation_;
 };
 
-- (id)initWithOwner:(BrowserWindowController*)owner browser:(Browser*)browser;
+// Initializes a new InfoBarController.
+- (id)initWithOwner:(BrowserWindowController*)owner
+            browser:(Browser*)browser
+             forURL:(const GURL&)url
+      askPermission:(BOOL)askPermission;
+
+// Called when someone clicks on the OK or Cancel buttons.  Subclasses
+// must override if they do not hide the buttons.

[Nico, 2011/10/13 05:24:10]

There are no subclasses, are there? Are there ok or cancel buttons even?

[koz (OOO until 15th September), 2011/10/13 06:09:43]

Ah, copy/paste fail. Fixed.

+- (void)allow:(id)sender;
+- (void)deny:(id)sender;
+
+- (void)showWindow;
 
 // Positions the fullscreen exit bubble in the top-center of the window.
 - (void)positionInWindowAtTop:(CGFloat)maxY width:(CGFloat)maxWidth;
 
-// Returns a pointer to this controller's view, cast as an AnimatableView.
-- (AnimatableView*)animatableView;
-
 @end