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

Unified Diff: chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h

Issue 10332185: Update behavior of one-click infobar to remove modal dialog, add "undo". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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/one_click_signin_bubble_controller.h
diff --git a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h
index 0a0261b36464c3ec2c452936d4c4889f1733adaf..c3f2f1134f3fa90da8307b519c8b4249ff38d2ee 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h
@@ -9,6 +9,7 @@
#import <Cocoa/Cocoa.h>
#include "base/callback.h"
+#include "chrome/browser/ui/browser_window.h"
#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
@class BrowserWindowController;
@@ -18,11 +19,14 @@
@interface OneClickSigninBubbleController : BaseBubbleController {
@private
IBOutlet NSTextField* messageField_;
+ // TODO(akalin): learnMoreLink_ needs to be removed, but it can't be until
+ // the nib is changed too.
IBOutlet NSButton* learnMoreLink_;
IBOutlet NSButton* advancedLink_;
- base::Closure learnMoreCallback_;
- base::Closure advancedCallback_;
+ // TODO(akalin): Make sure this callback is called only once, like on
+ // other platforms.
+ BrowserWindow::StartSyncCallback start_sync_callback_;
}
// Initializes with a browser window controller, under whose wrench
@@ -32,15 +36,13 @@
// The bubble is not automatically displayed; call showWindow:id to
// display. The bubble is auto-released on close.
- (id)initWithBrowserWindowController:(BrowserWindowController*)controller
- learnMoreCallback:(const base::Closure&)learnMoreCallback
- advancedCallback:(const base::Closure&)advancedCallback;
+ start_sync_callback:
+ (const BrowserWindow::StartSyncCallback&)
+ start_sync_callback;
-// Just closes the bubble.
+// Starts sync and closes the bubble.
- (IBAction)ok:(id)sender;
-// Calls |learnMoreCallback_|.
-- (IBAction)onClickLearnMoreLink:(id)sender;
-
// Calls |advancedCallback_|.
- (IBAction)onClickAdvancedLink:(id)sender;
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/ui/cocoa/one_click_signin_bubble_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698