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

Side by Side Diff: chrome/browser/ui/cocoa/importer/import_progress_dialog.h

Issue 6258017: Mac: Never have a space between @property and ( (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome
Patch Set: Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_IMPORTER_IMPORT_PROGRESS_DIALOG_H_ 5 #ifndef CHROME_BROWSER_IMPORTER_IMPORT_PROGRESS_DIALOG_H_
6 #define CHROME_BROWSER_IMPORTER_IMPORT_PROGRESS_DIALOG_H_ 6 #define CHROME_BROWSER_IMPORTER_IMPORT_PROGRESS_DIALOG_H_
7 #pragma once 7 #pragma once
8 8
9 #import <Cocoa/Cocoa.h> 9 #import <Cocoa/Cocoa.h>
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 - (IBAction)cancel:(id)sender; 45 - (IBAction)cancel:(id)sender;
46 46
47 // Closes the dialog. 47 // Closes the dialog.
48 - (void)closeDialog; 48 - (void)closeDialog;
49 49
50 // Methods called by importer_host via ImporterObserverBridge. 50 // Methods called by importer_host via ImporterObserverBridge.
51 - (void)ImportItemStarted:(importer::ImportItem)item; 51 - (void)ImportItemStarted:(importer::ImportItem)item;
52 - (void)ImportItemEnded:(importer::ImportItem)item; 52 - (void)ImportItemEnded:(importer::ImportItem)item;
53 - (void)ImportEnded; 53 - (void)ImportEnded;
54 54
55 @property (nonatomic, retain) NSString* explanatoryText; 55 @property(nonatomic, retain) NSString* explanatoryText;
Robert Sesek 2011/01/24 18:03:57 Move these to be after the ivar block.
56 @property (nonatomic, retain) NSString* favoritesStatusText; 56 @property(nonatomic, retain) NSString* favoritesStatusText;
57 @property (nonatomic, retain) NSString* searchStatusText; 57 @property(nonatomic, retain) NSString* searchStatusText;
58 @property (nonatomic, retain) NSString* savedPasswordStatusText; 58 @property(nonatomic, retain) NSString* savedPasswordStatusText;
59 @property (nonatomic, retain) NSString* historyStatusText; 59 @property(nonatomic, retain) NSString* historyStatusText;
60 60
61 @property (nonatomic, retain) NSColor* favoritesImportEnabled; 61 @property(nonatomic, retain) NSColor* favoritesImportEnabled;
62 @property (nonatomic, retain) NSColor* searchImportEnabled; 62 @property(nonatomic, retain) NSColor* searchImportEnabled;
63 @property (nonatomic, retain) NSColor* passwordImportEnabled; 63 @property(nonatomic, retain) NSColor* passwordImportEnabled;
64 @property (nonatomic, retain) NSColor* historyImportEnabled; 64 @property(nonatomic, retain) NSColor* historyImportEnabled;
65 65
66 @end 66 @end
67 67
68 // C++ -> objc bridge for import status notifications. 68 // C++ -> objc bridge for import status notifications.
69 class ImporterObserverBridge : public ImporterHost::Observer { 69 class ImporterObserverBridge : public ImporterHost::Observer {
70 public: 70 public:
71 ImporterObserverBridge(ImportProgressDialogController* owner) 71 ImporterObserverBridge(ImportProgressDialogController* owner)
72 : owner_(owner) {} 72 : owner_(owner) {}
73 virtual ~ImporterObserverBridge() {} 73 virtual ~ImporterObserverBridge() {}
74 74
(...skipping 18 matching lines...) Expand all
93 [owner_ ImportEnded]; 93 [owner_ ImportEnded];
94 } 94 }
95 95
96 private: 96 private:
97 ImportProgressDialogController* owner_; 97 ImportProgressDialogController* owner_;
98 98
99 DISALLOW_COPY_AND_ASSIGN(ImporterObserverBridge); 99 DISALLOW_COPY_AND_ASSIGN(ImporterObserverBridge);
100 }; 100 };
101 101
102 #endif // CHROME_BROWSER_IMPORTER_IMPORT_PROGRESS_DIALOG_H_ 102 #endif // CHROME_BROWSER_IMPORTER_IMPORT_PROGRESS_DIALOG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698