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

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h

Issue 7835039: Implement the inline extensions/apps install UI for Cocoa. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h
===================================================================
--- chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h (revision 99418)
+++ chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h (working copy)
@@ -10,7 +10,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "chrome/browser/extensions/extension_install_ui.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -24,31 +24,38 @@
@private
IBOutlet NSImageView* iconView_;
IBOutlet NSTextField* titleField_;
- IBOutlet NSTextField* subtitleField_;
- IBOutlet NSTextField* warningsField_;
- IBOutlet NSBox* warningsBox_;
IBOutlet NSButton* cancelButton_;
IBOutlet NSButton* okButton_;
+ // Present only when the dialog has permission warnings to display.
+ IBOutlet NSTextField* subtitleField_;
+ IBOutlet NSTextField* warningsField_;
+
+ // Present only in the inline install dialog.
+ IBOutlet NSBox* warningsSeparator_; // Only when there are permissions.
+ IBOutlet NSView* ratingStars_;
+ IBOutlet NSTextField* ratingCountField_;
+ IBOutlet NSTextField* userCountField_;
+
NSWindow* parentWindow_; // weak
Profile* profile_; // weak
ExtensionInstallUI::Delegate* delegate_; // weak
-
- scoped_nsobject<NSString> title_;
- scoped_nsobject<NSString> warnings_;
- scoped_nsobject<NSString> button_;
- scoped_nsobject<NSString> cancel_button_;
- scoped_nsobject<NSString> subtitle_;
+ const Extension* extension_; // weak
+ scoped_ptr<ExtensionInstallUI::Prompt> prompt_;
SkBitmap icon_;
}
+// For unit test use only
@property(nonatomic, readonly) NSImageView* iconView;
@property(nonatomic, readonly) NSTextField* titleField;
@property(nonatomic, readonly) NSTextField* subtitleField;
@property(nonatomic, readonly) NSTextField* warningsField;
-@property(nonatomic, readonly) NSBox* warningsBox;
@property(nonatomic, readonly) NSButton* cancelButton;
@property(nonatomic, readonly) NSButton* okButton;
+@property(nonatomic, readonly) NSBox* warningsSeparator;
+@property(nonatomic, readonly) NSView* ratingStars;
+@property(nonatomic, readonly) NSTextField* ratingCountField;
+@property(nonatomic, readonly) NSTextField* userCountField;
- (id)initWithParentWindow:(NSWindow*)window
profile:(Profile*)profile
@@ -57,6 +64,7 @@
icon:(SkBitmap*)bitmap
prompt:(const ExtensionInstallUI::Prompt&)prompt;
- (void)runAsModalSheet;
+- (IBAction)storeLinkClicked:(id)sender; // Callback for "View details" link.
- (IBAction)cancel:(id)sender;
- (IBAction)ok:(id)sender;

Powered by Google App Engine
This is Rietveld 408576698