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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/nibs/Preferences.xib

Issue 380006: Added Sync-related controls to Preferences pane under "Personal Stuff". (Closed)
Patch Set: Synced to HEAD (after failed commit). Created 11 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/cocoa/preferences_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/nibs/Preferences.xib
diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib
index 00123efb2ad41647ad85ad0c0ec486bcc225f80b..22d1aa51e7c572c6358e5c640e630464357d3285 100644
--- a/chrome/app/nibs/Preferences.xib
+++ b/chrome/app/nibs/Preferences.xib
@@ -2,14 +2,15 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9L30</string>
- <string key="IBDocument.InterfaceBuilderVersion">677</string>
+ <string key="IBDocument.SystemVersion">9L31a</string>
+ <string key="IBDocument.InterfaceBuilderVersion">680</string>
<string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="74"/>
<integer value="3"/>
+ <integer value="482"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1702,7 +1703,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="393583039">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1722,6 +1723,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTextColor" ref="748094473"/>
</object>
</object>
+ <object class="NSTextField" id="20640598">
+ <reference key="NSNextResponder" ref="393583039"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{17, 290}, {128, 60}}</string>
+ <reference key="NSSuperview" ref="393583039"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="101746388">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">^IDS_SYNC_OPTIONS_GROUP_NAME</string>
+ <reference key="NSSupport" ref="290273273"/>
+ <reference key="NSControlView" ref="20640598"/>
+ <reference key="NSBackgroundColor" ref="592613688"/>
+ <reference key="NSTextColor" ref="748094473"/>
+ </object>
+ </object>
<object class="NSMatrix" id="1019357609">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">266</int>
@@ -1934,6 +1951,26 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
+ <object class="NSButton" id="203729106">
+ <reference key="NSNextResponder" ref="393583039"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{146, 322}, {184, 32}}</string>
+ <reference key="NSSuperview" ref="393583039"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="431766699">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">^IDS_SYNC_START_SYNC_BUTTON_LABEL</string>
+ <reference key="NSSupport" ref="445696277"/>
+ <reference key="NSControlView" ref="203729106"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
<object class="NSTextField" id="921350969">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
@@ -1998,6 +2035,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTextColor" ref="748094473"/>
</object>
</object>
+ <object class="NSTextField" id="90260648">
+ <reference key="NSNextResponder" ref="393583039"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{149, 294}, {364, 28}}</string>
+ <reference key="NSSuperview" ref="393583039"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="123936632">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">272629760</int>
+ <string key="NSContents">^IDS_SYNC_NOT_SET_UP_INFO</string>
+ <reference key="NSSupport" ref="783256529"/>
+ <reference key="NSControlView" ref="90260648"/>
+ <reference key="NSBackgroundColor" ref="592613688"/>
+ <reference key="NSTextColor" ref="748094473"/>
+ </object>
+ </object>
<object class="NSButton" id="885386403">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
@@ -2271,7 +2324,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
</object>
- <string key="NSFrameSize">{530, 290}</string>
+ <string key="NSFrameSize">{530, 370}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="933437956">
@@ -2394,6 +2448,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSCustomObject" id="376486454">
<string key="NSClassName">GTMIBArray</string>
</object>
+ <object class="NSCustomObject" id="821768455">
+ <string key="NSClassName">GTMIBArray</string>
+ </object>
<object class="NSCustomObject" id="325031373">
<string key="NSClassName">GTMIBArray</string>
</object>
@@ -3482,6 +3539,62 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">600</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">syncButton_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="203729106"/>
+ </object>
+ <int key="connectionID">607</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">syncStatus_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="90260648"/>
+ </object>
+ <int key="connectionID">608</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">doSyncAction:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="203729106"/>
+ </object>
+ <int key="connectionID">609</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object1_</string>
+ <reference key="source" ref="821768455"/>
+ <reference key="destination" ref="20640598"/>
+ </object>
+ <int key="connectionID">611</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">personalStuffGroupSync_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="821768455"/>
+ </object>
+ <int key="connectionID">614</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object2_</string>
+ <reference key="source" ref="821768455"/>
+ <reference key="destination" ref="203729106"/>
+ </object>
+ <int key="connectionID">615</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">object3_</string>
+ <reference key="source" ref="821768455"/>
+ <reference key="destination" ref="90260648"/>
+ </object>
+ <int key="connectionID">616</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -3955,6 +4068,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="423027085"/>
<reference ref="865039969"/>
<reference ref="987908490"/>
+ <reference ref="20640598"/>
+ <reference ref="90260648"/>
+ <reference ref="203729106"/>
</object>
<reference key="parent" ref="415821041"/>
<string key="objectName">Personal Stuff View</string>
@@ -4656,6 +4772,54 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="938815385"/>
<reference key="parent" ref="415821041"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">601</int>
+ <reference key="object" ref="20640598"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="101746388"/>
+ </object>
+ <reference key="parent" ref="393583039"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">602</int>
+ <reference key="object" ref="101746388"/>
+ <reference key="parent" ref="20640598"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">603</int>
+ <reference key="object" ref="90260648"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="123936632"/>
+ </object>
+ <reference key="parent" ref="393583039"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">604</int>
+ <reference key="object" ref="123936632"/>
+ <reference key="parent" ref="90260648"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">605</int>
+ <reference key="object" ref="203729106"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="431766699"/>
+ </object>
+ <reference key="parent" ref="393583039"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">606</int>
+ <reference key="object" ref="431766699"/>
+ <reference key="parent" ref="203729106"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">610</int>
+ <reference key="object" ref="821768455"/>
+ <reference key="parent" ref="415821041"/>
+ <string key="objectName">Personal Stuff Sync Group</string>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -4807,7 +4971,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>59.IBPluginDependency</string>
<string>596.IBPluginDependency</string>
<string>60.IBPluginDependency</string>
+ <string>601.IBPluginDependency</string>
+ <string>602.IBPluginDependency</string>
+ <string>603.IBPluginDependency</string>
+ <string>604.IBPluginDependency</string>
+ <string>605.IBPluginDependency</string>
+ <string>606.IBPluginDependency</string>
<string>61.IBPluginDependency</string>
+ <string>610.IBPluginDependency</string>
<string>62.IBPluginDependency</string>
<string>63.IBPluginDependency</string>
<string>64.IBPluginDependency</string>
@@ -4945,7 +5116,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
- <string>{{86, 695}, {530, 290}}</string>
+ <string>{{181, 428}, {530, 370}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{87, 136}, {530, 463}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4995,7 +5166,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{557, 200}, {443, 665}}</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>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{557, 191}, {443, 665}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5035,7 +5213,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">600</int>
+ <int key="maxID">616</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5187,6 +5365,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>addHomepage:</string>
<string>browseDownloadLocation:</string>
<string>clearData:</string>
+ <string>doSyncAction:</string>
<string>importData:</string>
<string>makeDefaultBrowser:</string>
<string>manageSearchEngines:</string>
@@ -5215,6 +5394,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@@ -5234,8 +5414,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>personalStuffGroupAutofill_</string>
<string>personalStuffGroupBrowserData_</string>
<string>personalStuffGroupPasswords_</string>
+ <string>personalStuffGroupSync_</string>
<string>personalStuffGroupThemes_</string>
<string>personalStuffView_</string>
+ <string>syncButton_</string>
+ <string>syncStatus_</string>
<string>toolbar_</string>
<string>underTheHoodContentView_</string>
<string>underTheHoodScroller_</string>
@@ -5257,7 +5440,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSArray</string>
<string>NSArray</string>
<string>NSArray</string>
+ <string>NSArray</string>
<string>NSView</string>
+ <string>NSButton</string>
+ <string>NSTextField</string>
<string>NSToolbar</string>
<string>NSView</string>
<string>NSScrollView</string>
« no previous file with comments | « no previous file | chrome/browser/cocoa/preferences_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698