Revert r35069

Review URL: http://codereview.chromium.org/509002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35070 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 101 insertions, 14 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2ca023b..0bf1e62 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3135,6 +3135,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_IMPORT_FAVORITES_CHKBOX" desc="Checkbox for importing favorites">
         Favorites/Bookmarks
       </message>
+      <message name="IDS_IMPORT_COOKIES_CHKBOX" desc="Checkbox for importing cookies">
+        Cookies
+      </message>
       <message name="IDS_IMPORT_PASSWORDS_CHKBOX" desc="Checkbox for importing saved passwords">
         Saved passwords
       </message>
diff --git a/chrome/app/nibs/ImportSettingsDialog.xib b/chrome/app/nibs/ImportSettingsDialog.xib
index 1ef5105..24828ae 100644
--- a/chrome/app/nibs/ImportSettingsDialog.xib
+++ b/chrome/app/nibs/ImportSettingsDialog.xib
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="2"/>
+			<integer value="101"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -37,7 +37,7 @@
 			<object class="NSWindowTemplate" id="1005">
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 314}, {290, 196}}</string>
+				<string key="NSWindowRect">{{196, 289}, {290, 221}}</string>
 				<int key="NSWTFlags">536871936</int>
 				<string key="NSWindowTitle">^IDS_IMPORT_SETTINGS_TITLE</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -200,7 +200,7 @@
 									</object>
 								</object>
 							</object>
-							<string key="NSFrame">{{0, 158}, {290, 33}}</string>
+							<string key="NSFrame">{{0, 183}, {290, 33}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<string key="NSClassName">GTMWidthBasedTweaker</string>
 						</object>
@@ -212,7 +212,7 @@
 								<object class="NSButton" id="954452115">
 									<reference key="NSNextResponder" ref="978310322"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{17, 66}, {235, 18}}</string>
+									<string key="NSFrame">{{17, 89}, {235, 18}}</string>
 									<reference key="NSSuperview" ref="978310322"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="241240932">
@@ -239,7 +239,7 @@
 								<object class="NSButton" id="556808145">
 									<reference key="NSNextResponder" ref="978310322"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{17, 46}, {235, 18}}</string>
+									<string key="NSFrame">{{17, 69}, {235, 18}}</string>
 									<reference key="NSSuperview" ref="978310322"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="36000965">
@@ -258,10 +258,32 @@
 										<int key="NSPeriodicInterval">25</int>
 									</object>
 								</object>
+								<object class="NSButton" id="1049294256">
+									<reference key="NSNextResponder" ref="978310322"/>
+									<int key="NSvFlags">268</int>
+									<string key="NSFrame">{{17, 49}, {235, 18}}</string>
+									<reference key="NSSuperview" ref="978310322"/>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSButtonCell" key="NSCell" id="857709409">
+										<int key="NSCellFlags">67239424</int>
+										<int key="NSCellFlags2">0</int>
+										<string key="NSContents">^IDS_IMPORT_COOKIES_CHKBOX</string>
+										<reference key="NSSupport" ref="605141190"/>
+										<reference key="NSControlView" ref="1049294256"/>
+										<int key="NSButtonFlags">1211912703</int>
+										<int key="NSButtonFlags2">130</int>
+										<reference key="NSNormalImage" ref="437518122"/>
+										<reference key="NSAlternateImage" ref="387174411"/>
+										<string key="NSAlternateContents"/>
+										<string key="NSKeyEquivalent"/>
+										<int key="NSPeriodicDelay">200</int>
+										<int key="NSPeriodicInterval">25</int>
+									</object>
+								</object>
 								<object class="NSButton" id="763356826">
 									<reference key="NSNextResponder" ref="978310322"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{17, 26}, {235, 18}}</string>
+									<string key="NSFrame">{{17, 29}, {235, 18}}</string>
 									<reference key="NSSuperview" ref="978310322"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="460770311">
@@ -283,7 +305,7 @@
 								<object class="NSButton" id="642124660">
 									<reference key="NSNextResponder" ref="978310322"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{17, 6}, {235, 18}}</string>
+									<string key="NSFrame">{{17, 9}, {235, 18}}</string>
 									<reference key="NSSuperview" ref="978310322"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="25343378">
@@ -305,7 +327,7 @@
 								<object class="NSTextField" id="249453492">
 									<reference key="NSNextResponder" ref="978310322"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{4, 90}, {343, 17}}</string>
+									<string key="NSFrame">{{4, 113}, {343, 17}}</string>
 									<reference key="NSSuperview" ref="978310322"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSTextFieldCell" key="NSCell" id="826519617">
@@ -319,12 +341,12 @@
 									</object>
 								</object>
 							</object>
-							<string key="NSFrame">{{20, 49}, {270, 110}}</string>
+							<string key="NSFrame">{{20, 51}, {270, 133}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<string key="NSClassName">GTMWidthBasedTweaker</string>
 						</object>
 					</object>
-					<string key="NSFrameSize">{290, 196}</string>
+					<string key="NSFrameSize">{290, 221}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -460,6 +482,22 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: importCookies</string>
+						<reference key="source" ref="1049294256"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="1049294256"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">value: importCookies</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">importCookies</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">160</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: importPasswords</string>
 						<reference key="source" ref="763356826"/>
 						<reference key="destination" ref="1001"/>
@@ -524,6 +562,22 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: cookiesAvailable</string>
+						<reference key="source" ref="1049294256"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="1049294256"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">enabled: cookiesAvailable</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">cookiesAvailable</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">166</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
 						<string key="label">enabled: passwordsAvailable</string>
 						<reference key="source" ref="763356826"/>
 						<reference key="destination" ref="1001"/>
@@ -767,6 +821,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="954452115"/>
+							<reference ref="1049294256"/>
 							<reference ref="763356826"/>
 							<reference ref="642124660"/>
 							<reference ref="249453492"/>
@@ -793,6 +848,15 @@
 						<reference key="parent" ref="978310322"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">146</int>
+						<reference key="object" ref="1049294256"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="857709409"/>
+						</object>
+						<reference key="parent" ref="978310322"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">147</int>
 						<reference key="object" ref="763356826"/>
 						<object class="NSMutableArray" key="children">
@@ -835,6 +899,11 @@
 						<reference key="parent" ref="763356826"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">153</int>
+						<reference key="object" ref="857709409"/>
+						<reference key="parent" ref="1049294256"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">154</int>
 						<reference key="object" ref="36000965"/>
 						<reference key="parent" ref="556808145"/>
@@ -864,6 +933,7 @@
 					<string>111.IBPluginDependency</string>
 					<string>144.IBPluginDependency</string>
 					<string>145.IBPluginDependency</string>
+					<string>146.IBPluginDependency</string>
 					<string>147.IBPluginDependency</string>
 					<string>148.IBPluginDependency</string>
 					<string>149.IBPluginDependency</string>
@@ -871,6 +941,7 @@
 					<string>150.IBPluginDependency</string>
 					<string>151.IBPluginDependency</string>
 					<string>152.IBPluginDependency</string>
+					<string>153.IBPluginDependency</string>
 					<string>154.IBPluginDependency</string>
 					<string>155.IBPluginDependency</string>
 					<string>16.IBPluginDependency</string>
@@ -891,9 +962,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{471, 660}, {290, 196}}</string>
+					<string>{{471, 635}, {290, 221}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{471, 660}, {290, 196}}</string>
+					<string>{{471, 635}, {290, 221}}</string>
 					<boolean value="NO"/>
 					<string>{196, 240}</string>
 					<string>{{357, 418}, {480, 270}}</string>
@@ -912,6 +983,8 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{465, 184}, {146, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
diff --git a/chrome/browser/cocoa/import_settings_dialog.h b/chrome/browser/cocoa/import_settings_dialog.h
index 3f4fce1..5a305a2 100644
--- a/chrome/browser/cocoa/import_settings_dialog.h
+++ b/chrome/browser/cocoa/import_settings_dialog.h
@@ -25,10 +25,12 @@ class Profile;
   // The following are all bound via the properties below.
   BOOL importHistory_;
   BOOL importFavorites_;
+  BOOL importCookies_;
   BOOL importPasswords_;
   BOOL importSearchEngines_;
   BOOL historyAvailable_;
   BOOL favoritesAvailable_;
+  BOOL cookiesAvailable_;
   BOOL passwordsAvailable_;
   BOOL searchEnginesAvailable_;
 }
@@ -61,11 +63,13 @@ class Profile;
 // Bindings for the value of the import checkboxes.
 @property(assign, nonatomic) BOOL importHistory;
 @property(assign, nonatomic) BOOL importFavorites;
+@property(assign, nonatomic) BOOL importCookies;
 @property(assign, nonatomic) BOOL importPasswords;
 @property(assign, nonatomic) BOOL importSearchEngines;
 // Bindings for enabling/disabling the checkboxes.
 @property(assign, readonly, nonatomic) BOOL historyAvailable;
 @property(assign, readonly, nonatomic) BOOL favoritesAvailable;
+@property(assign, readonly, nonatomic) BOOL cookiesAvailable;
 @property(assign, readonly, nonatomic) BOOL passwordsAvailable;
 @property(assign, readonly, nonatomic) BOOL searchEnginesAvailable;
 
diff --git a/chrome/browser/cocoa/import_settings_dialog.mm b/chrome/browser/cocoa/import_settings_dialog.mm
index 245856b..7d8babe 100644
--- a/chrome/browser/cocoa/import_settings_dialog.mm
+++ b/chrome/browser/cocoa/import_settings_dialog.mm
@@ -13,6 +13,7 @@
 
 @property(assign, readwrite, nonatomic) BOOL historyAvailable;
 @property(assign, readwrite, nonatomic) BOOL favoritesAvailable;
+@property(assign, readwrite, nonatomic) BOOL cookiesAvailable;
 @property(assign, readwrite, nonatomic) BOOL passwordsAvailable;
 @property(assign, readwrite, nonatomic) BOOL searchEnginesAvailable;
 
@@ -63,17 +64,19 @@
 @synthesize sourceBrowserIndex = sourceBrowserIndex_;
 @synthesize importHistory = importHistory_;
 @synthesize importFavorites = importFavorites_;
+@synthesize importCookies = importCookies_;
 @synthesize importPasswords = importPasswords_;
 @synthesize importSearchEngines = importSearchEngines_;
 @synthesize historyAvailable = historyAvailable_;
 @synthesize favoritesAvailable = favoritesAvailable_;
+@synthesize cookiesAvailable = cookiesAvailable_;
 @synthesize passwordsAvailable = passwordsAvailable_;
 @synthesize searchEnginesAvailable = searchEnginesAvailable_;
 
 // Set bindings dependencies for importSomething property.
 + (NSSet*)keyPathsForValuesAffectingImportSomething {
   return [NSSet setWithObjects:@"importHistory", @"importFavorites",
-          @"importPasswords", @"importSearchEngines", nil];
+          @"importCookies", @"importPasswords", @"importSearchEngines", nil];
 }
 
 - (id)initWithProfile:(Profile*)profile
@@ -199,6 +202,8 @@
   [self setImportHistory:[self historyAvailable]];
   [self setFavoritesAvailable:(items & FAVORITES) ? YES : NO];
   [self setImportFavorites:[self favoritesAvailable]];
+  [self setCookiesAvailable:(items & COOKIES) ? YES : NO];
+  [self setImportCookies:[self cookiesAvailable]];
   [self setPasswordsAvailable:(items & PASSWORDS) ? YES : NO];
   [self setImportPasswords:[self passwordsAvailable]];
   [self setSearchEnginesAvailable:(items & SEARCH_ENGINES) ? YES : NO];
@@ -209,6 +214,7 @@
   uint16 servicesToImport = 0;
   if ([self importHistory]) servicesToImport |= HISTORY;
   if ([self importFavorites]) servicesToImport |= FAVORITES;
+  if ([self importCookies]) servicesToImport |= COOKIES;
   if ([self importPasswords]) servicesToImport |= PASSWORDS;
   if ([self importSearchEngines]) servicesToImport |= SEARCH_ENGINES;
   return servicesToImport;
@@ -219,7 +225,8 @@
 // and bound to the OK button's enable property.
 - (BOOL)importSomething {
   return [self importHistory] || [self importFavorites] ||
-      [self importPasswords] || [self importSearchEngines];
+      [self importCookies] || [self importPasswords] ||
+      [self importSearchEngines];
 }
 
 @end