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

Unified Diff: chrome/browser/ui/cocoa/intents/web_intent_view_controller_progress.h

Issue 11009017: Mac Web Intents Part 11: Progress view (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: a Created 8 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/intents/web_intent_view_controller_progress.h
diff --git a/chrome/browser/ui/cocoa/intents/web_intent_view_controller_message.h b/chrome/browser/ui/cocoa/intents/web_intent_view_controller_progress.h
similarity index 57%
copy from chrome/browser/ui/cocoa/intents/web_intent_view_controller_message.h
copy to chrome/browser/ui/cocoa/intents/web_intent_view_controller_progress.h
index e6f2aec0d4622a7c3be4d1808cbc3b46d705d2f6..e591955ed6f60da4990d5ffd10ae781a19e95e55 100644
--- a/chrome/browser/ui/cocoa/intents/web_intent_view_controller_message.h
+++ b/chrome/browser/ui/cocoa/intents/web_intent_view_controller_progress.h
@@ -2,24 +2,32 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_VIEW_CONTROLLER_MESSAGE_H_
-#define CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_VIEW_CONTROLLER_MESSAGE_H_
+#ifndef CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_VIEW_CONTROLLER_PROGRESS_H_
+#define CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_VIEW_CONTROLLER_PROGRESS_H_
#import <Cocoa/Cocoa.h>
#include "base/memory/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/intents/web_intent_view_controller.h"
-// The message view simply shows a title and message.
-@interface WebIntentViewControllerMessage : NSViewController
- <WebIntentViewControllerProtocol> {
+@class SpinnerProgressIndicator;
+
+// The progress view shows a progress indicator and a label underneath it. The
+// label is made by joining the title and the message.
+@interface WebIntentViewControllerProgress : NSViewController
Nico 2012/10/02 03:47:25 As I mentioned in an earlier CL of this saga, I th
sail 2012/10/10 02:00:10 Done.
+ <WebIntentViewControllerProtocol> {
@private
- scoped_nsobject<NSTextField> titleTextField_;
+ scoped_nsobject<NSString> title_;
+ scoped_nsobject<NSString> message_;
scoped_nsobject<NSTextField> messageTextField_;
+ scoped_nsobject<SpinnerProgressIndicator> progressIndicator_;
}
+- (SpinnerProgressIndicator*)progressIndicator;
+
- (void)setTitle:(NSString*)title;
- (void)setMessage:(NSString*)message;
+- (void)setPercentDone:(int)percent;
// WebIntentViewControllerProtocol implementation.
- (NSSize)minimumSizeForInnerWidth:(CGFloat)innerWidth;
@@ -27,4 +35,4 @@
@end
-#endif // CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_VIEW_CONTROLLER_MESSAGE_H_
+#endif // CHROME_BROWSER_UI_COCOA_INTENTS_WEB_INTENT_VIEW_CONTROLLER_PROGRESS_H_

Powered by Google App Engine
This is Rietveld 408576698