summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-01 23:55:41 +0000
committerdantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-01 23:55:41 +0000
commite4875b32c749274333c1381a5a25c5a405d9cc81 (patch)
tree2ee0d4687f30f3aac6dff38be2a1c2d39d9619d3 /chrome
parent4876a8fe9dc841182200196aaf9642f7b8cff538 (diff)
downloadchromium_src-e4875b32c749274333c1381a5a25c5a405d9cc81.zip
chromium_src-e4875b32c749274333c1381a5a25c5a405d9cc81.tar.gz
chromium_src-e4875b32c749274333c1381a5a25c5a405d9cc81.tar.bz2
Remove the old 'customize sync' panel from win/mac/linux. And a little bit of leftover references to "merge and sync."
BUG=48125 TEST=Start up sync, change data types, stop sync, etc, nothing should break. Review URL: http://codereview.chromium.org/2843019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/nibs/SyncCustomize.xib944
-rw-r--r--chrome/browser/cocoa/preferences_window_controller.mm3
-rw-r--r--chrome/browser/cocoa/sync_customize_controller.h71
-rw-r--r--chrome/browser/cocoa/sync_customize_controller.mm190
-rw-r--r--chrome/browser/cocoa/sync_customize_controller_cppsafe.h21
-rw-r--r--chrome/browser/cocoa/sync_customize_controller_unittest.mm125
-rw-r--r--chrome/browser/gtk/options/content_page_gtk.cc3
-rw-r--r--chrome/browser/gtk/options/customize_sync_window_gtk.cc305
-rw-r--r--chrome/browser/gtk/options/customize_sync_window_gtk.h14
-rw-r--r--chrome/browser/sync/profile_sync_service_mock.h1
-rw-r--r--chrome/browser/sync/resources/gaia_login_test.html3
-rw-r--r--chrome/browser/sync/sync_setup_flow.cc43
-rw-r--r--chrome/browser/sync/sync_setup_flow.h42
-rw-r--r--chrome/browser/sync/sync_setup_wizard.cc2
-rw-r--r--chrome/browser/sync/sync_setup_wizard_unittest.cc15
-rw-r--r--chrome/browser/views/options/content_page_view.cc1
-rw-r--r--chrome/browser/views/options/customize_sync_window_view.cc284
-rw-r--r--chrome/browser/views/options/customize_sync_window_view.h89
-rw-r--r--chrome/chrome_browser.gypi8
-rw-r--r--chrome/chrome_dll.gypi1
-rw-r--r--chrome/chrome_tests.gypi1
-rw-r--r--chrome/common/url_constants.h1
22 files changed, 5 insertions, 2162 deletions
diff --git a/chrome/app/nibs/SyncCustomize.xib b/chrome/app/nibs/SyncCustomize.xib
deleted file mode 100644
index 188c715..0000000
--- a/chrome/app/nibs/SyncCustomize.xib
+++ /dev/null
@@ -1,944 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
- <data>
- <int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9L31a</string>
- <string key="IBDocument.InterfaceBuilderVersion">677</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="53"/>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomObject" id="1001">
- <string key="NSClassName">SyncCustomizeController</string>
- </object>
- <object class="NSCustomObject" id="1003">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="1004">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="114461420">
- <int key="NSWindowStyleMask">7</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{196, 303}, {327, 207}}</string>
- <int key="NSWTFlags">544735232</int>
- <string key="NSWindowTitle">^IDS_CUSTOMIZE_SYNC_WINDOW_TITLE</string>
- <string key="NSWindowClass">NSWindow</string>
- <nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
- <object class="NSView" key="NSWindowView" id="925353020">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSTextField" id="876599071">
- <reference key="NSNextResponder" ref="925353020"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{13, 170}, {297, 17}}</string>
- <reference key="NSSuperview" ref="925353020"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="549427740">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">272629760</int>
- <string key="NSContents">^IDS_CUSTOMIZE_SYNC_DESCRIPTION</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande-Bold</string>
- <double key="NSSize">1.300000e+01</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="876599071"/>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
- </object>
- <object class="NSButton" id="964883359">
- <reference key="NSNextResponder" ref="925353020"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{26, 139}, {251, 18}}</string>
- <reference key="NSSuperview" ref="925353020"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="558390885">
- <int key="NSCellFlags">604110336</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_SYNC_DATATYPE_BOOKMARKS</string>
- <object class="NSFont" key="NSSupport" id="460135184">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">1.300000e+01</double>
- <int key="NSfFlags">1044</int>
- </object>
- <reference key="NSControlView" ref="964883359"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <object class="NSCustomResource" key="NSNormalImage" id="817906260">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSSwitch</string>
- </object>
- <object class="NSButtonImageSource" key="NSAlternateImage" id="165114022">
- <string key="NSImageName">NSSwitch</string>
- </object>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="515710968">
- <reference key="NSNextResponder" ref="925353020"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{26, 119}, {255, 18}}</string>
- <reference key="NSSuperview" ref="925353020"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="834577680">
- <int key="NSCellFlags">604110336</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_SYNC_DATATYPE_PREFERENCES</string>
- <reference key="NSSupport" ref="460135184"/>
- <reference key="NSControlView" ref="515710968"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="817906260"/>
- <reference key="NSAlternateImage" ref="165114022"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="903818124">
- <reference key="NSNextResponder" ref="925353020"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{26, 79}, {251, 18}}</string>
- <reference key="NSSuperview" ref="925353020"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="683407897">
- <int key="NSCellFlags">604110336</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_SYNC_DATATYPE_AUTOFILL</string>
- <reference key="NSSupport" ref="460135184"/>
- <reference key="NSControlView" ref="903818124"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="817906260"/>
- <reference key="NSAlternateImage" ref="165114022"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="430596235">
- <reference key="NSNextResponder" ref="925353020"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{26, 59}, {251, 18}}</string>
- <reference key="NSSuperview" ref="925353020"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="237072256">
- <int key="NSCellFlags">604110336</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_SYNC_DATATYPE_EXTENSIONS</string>
- <reference key="NSSupport" ref="460135184"/>
- <reference key="NSControlView" ref="430596235"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="817906260"/>
- <reference key="NSAlternateImage" ref="165114022"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="425937350">
- <reference key="NSNextResponder" ref="925353020"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{26, 99}, {251, 18}}</string>
- <reference key="NSSuperview" ref="925353020"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="1004767639">
- <int key="NSCellFlags">604110336</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_SYNC_DATATYPE_THEMES</string>
- <reference key="NSSupport" ref="460135184"/>
- <reference key="NSControlView" ref="425937350"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="817906260"/>
- <reference key="NSAlternateImage" ref="165114022"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSCustomView" id="719383702">
- <reference key="NSNextResponder" ref="925353020"/>
- <int key="NSvFlags">289</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButton" id="451600561">
- <reference key="NSNextResponder" ref="719383702"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{110, 12}, {96, 32}}</string>
- <reference key="NSSuperview" ref="719383702"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="712688751">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">^IDS_OK</string>
- <reference key="NSSupport" ref="460135184"/>
- <reference key="NSControlView" ref="451600561"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="184847476">
- <reference key="NSNextResponder" ref="719383702"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{14, 12}, {96, 32}}</string>
- <reference key="NSSuperview" ref="719383702"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="794243980">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">^IDS_CANCEL</string>
- <reference key="NSSupport" ref="460135184"/>
- <reference key="NSControlView" ref="184847476"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- </object>
- <string key="NSFrame">{{107, 0}, {220, 60}}</string>
- <reference key="NSSuperview" ref="925353020"/>
- <string key="NSClassName">GTMWidthBasedTweaker</string>
- </object>
- </object>
- <string key="NSFrameSize">{327, 207}</string>
- <reference key="NSSuperview"/>
- </object>
- <string key="NSScreenRect">{{0, 0}, {2560, 1578}}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
- </object>
- <object class="NSCustomObject" id="359597893">
- <string key="NSClassName">ChromeUILocalizer</string>
- </object>
- <object class="NSCustomObject" id="862868165">
- <string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string>
- </object>
- <object class="NSUserDefaultsController" id="77152184">
- <bool key="NSSharedInstance">YES</bool>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">localizer_</string>
- <reference key="source" ref="862868165"/>
- <reference key="destination" ref="359597893"/>
- </object>
- <int key="connectionID">96</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">uiObject_</string>
- <reference key="source" ref="862868165"/>
- <reference key="destination" ref="114461420"/>
- </object>
- <int key="connectionID">98</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">window</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="114461420"/>
- </object>
- <int key="connectionID">99</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: bookmarksPreferred</string>
- <reference key="source" ref="964883359"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="964883359"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">value: bookmarksPreferred</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">bookmarksPreferred</string>
- <object class="NSDictionary" key="NSOptions">
- <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
- <boolean value="NO" key="NS.object.0" id="6"/>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">118</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: preferencesPreferred</string>
- <reference key="source" ref="515710968"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="515710968"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">value: preferencesPreferred</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">preferencesPreferred</string>
- <object class="NSDictionary" key="NSOptions">
- <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
- <reference key="NS.object.0" ref="6"/>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">122</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: themesPreferred</string>
- <reference key="source" ref="425937350"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="425937350"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">value: themesPreferred</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">themesPreferred</string>
- <object class="NSDictionary" key="NSOptions">
- <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
- <reference key="NS.object.0" ref="6"/>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">130</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">enabled: bookmarksRegistered</string>
- <reference key="source" ref="964883359"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="964883359"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">enabled: bookmarksRegistered</string>
- <string key="NSBinding">enabled</string>
- <string key="NSKeyPath">bookmarksRegistered</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">132</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">enabled: preferencesRegistered</string>
- <reference key="source" ref="515710968"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="515710968"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">enabled: preferencesRegistered</string>
- <string key="NSBinding">enabled</string>
- <string key="NSKeyPath">preferencesRegistered</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">134</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">enabled: autofillRegistered</string>
- <reference key="source" ref="903818124"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="903818124"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">enabled: autofillRegistered</string>
- <string key="NSBinding">enabled</string>
- <string key="NSKeyPath">autofillRegistered</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">136</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">enabled: themesRegistered</string>
- <reference key="source" ref="425937350"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="425937350"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">enabled: themesRegistered</string>
- <string key="NSBinding">enabled</string>
- <string key="NSKeyPath">themesRegistered</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">138</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">endSheetWithCancel:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="184847476"/>
- </object>
- <int key="connectionID">139</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">endSheetWithOK:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="451600561"/>
- </object>
- <int key="connectionID">140</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">enabled: okEnabled</string>
- <reference key="source" ref="451600561"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="451600561"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">enabled: okEnabled</string>
- <string key="NSBinding">enabled</string>
- <string key="NSKeyPath">okEnabled</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">143</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: autofillPreferred</string>
- <reference key="source" ref="903818124"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="903818124"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">value: autofillPreferred</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">autofillPreferred</string>
- <object class="NSDictionary" key="NSOptions">
- <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
- <reference key="NS.object.0" ref="6"/>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">148</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">customizeSyncDescriptionTextField_</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="876599071"/>
- </object>
- <int key="connectionID">149</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: extensionsPreferred</string>
- <reference key="source" ref="430596235"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="430596235"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">value: extensionsPreferred</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">extensionsPreferred</string>
- <object class="NSDictionary" key="NSOptions">
- <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
- <reference key="NS.object.0" ref="6"/>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">163</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">enabled: extensionsRegistered</string>
- <reference key="source" ref="430596235"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="430596235"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">enabled: extensionsRegistered</string>
- <string key="NSBinding">enabled</string>
- <string key="NSKeyPath">extensionsRegistered</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">166</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <object class="NSArray" key="object" id="233525062">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="1001"/>
- <reference key="parent" ref="233525062"/>
- <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="1003"/>
- <reference key="parent" ref="233525062"/>
- <string key="objectName">First Responder</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object" ref="1004"/>
- <reference key="parent" ref="233525062"/>
- <string key="objectName">Application</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">49</int>
- <reference key="object" ref="114461420"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="925353020"/>
- </object>
- <reference key="parent" ref="233525062"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">51</int>
- <reference key="object" ref="359597893"/>
- <reference key="parent" ref="233525062"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">52</int>
- <reference key="object" ref="862868165"/>
- <reference key="parent" ref="233525062"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">53</int>
- <reference key="object" ref="925353020"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="876599071"/>
- <reference ref="719383702"/>
- <reference ref="964883359"/>
- <reference ref="515710968"/>
- <reference ref="425937350"/>
- <reference ref="903818124"/>
- <reference ref="430596235"/>
- </object>
- <reference key="parent" ref="114461420"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">60</int>
- <reference key="object" ref="876599071"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="549427740"/>
- </object>
- <reference key="parent" ref="925353020"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">93</int>
- <reference key="object" ref="549427740"/>
- <reference key="parent" ref="876599071"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">102</int>
- <reference key="object" ref="964883359"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="558390885"/>
- </object>
- <reference key="parent" ref="925353020"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">103</int>
- <reference key="object" ref="558390885"/>
- <reference key="parent" ref="964883359"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">104</int>
- <reference key="object" ref="515710968"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="834577680"/>
- </object>
- <reference key="parent" ref="925353020"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">105</int>
- <reference key="object" ref="834577680"/>
- <reference key="parent" ref="515710968"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">108</int>
- <reference key="object" ref="425937350"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1004767639"/>
- </object>
- <reference key="parent" ref="925353020"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">109</int>
- <reference key="object" ref="1004767639"/>
- <reference key="parent" ref="425937350"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">55</int>
- <reference key="object" ref="719383702"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="451600561"/>
- <reference ref="184847476"/>
- </object>
- <reference key="parent" ref="925353020"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">57</int>
- <reference key="object" ref="184847476"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="794243980"/>
- </object>
- <reference key="parent" ref="719383702"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">56</int>
- <reference key="object" ref="451600561"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="712688751"/>
- </object>
- <reference key="parent" ref="719383702"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">59</int>
- <reference key="object" ref="712688751"/>
- <reference key="parent" ref="451600561"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">58</int>
- <reference key="object" ref="794243980"/>
- <reference key="parent" ref="184847476"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">114</int>
- <reference key="object" ref="77152184"/>
- <reference key="parent" ref="233525062"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">106</int>
- <reference key="object" ref="903818124"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="683407897"/>
- </object>
- <reference key="parent" ref="925353020"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">107</int>
- <reference key="object" ref="683407897"/>
- <reference key="parent" ref="903818124"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">156</int>
- <reference key="object" ref="430596235"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="237072256"/>
- </object>
- <reference key="parent" ref="925353020"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">157</int>
- <reference key="object" ref="237072256"/>
- <reference key="parent" ref="430596235"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-3.IBPluginDependency</string>
- <string>102.IBPluginDependency</string>
- <string>103.IBPluginDependency</string>
- <string>104.IBPluginDependency</string>
- <string>105.IBPluginDependency</string>
- <string>106.IBPluginDependency</string>
- <string>107.IBPluginDependency</string>
- <string>108.IBPluginDependency</string>
- <string>109.IBPluginDependency</string>
- <string>156.IBPluginDependency</string>
- <string>157.IBPluginDependency</string>
- <string>49.IBEditorWindowLastContentRect</string>
- <string>49.IBPluginDependency</string>
- <string>49.IBWindowTemplateEditedContentRect</string>
- <string>49.NSWindowTemplate.visibleAtLaunch</string>
- <string>49.WindowOrigin</string>
- <string>49.editorWindowContentRectSynchronizationRect</string>
- <string>53.IBPluginDependency</string>
- <string>55.IBPluginDependency</string>
- <string>56.IBPluginDependency</string>
- <string>57.IBPluginDependency</string>
- <string>58.IBPluginDependency</string>
- <string>59.IBPluginDependency</string>
- <string>60.IBPluginDependency</string>
- <string>93.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <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>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{832, 795}, {327, 207}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{832, 795}, {327, 207}}</string>
- <reference ref="6"/>
- <string>{196, 240}</string>
- <string>{{357, 418}, {480, 270}}</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>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">166</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">ChromeUILocalizer</string>
- <string key="superclassName">GTMUILocalizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/ui_localizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">GTMUILocalizer</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>otherObjectToLocalize_</string>
- <string>owner_</string>
- <string>yetAnotherObjectToLocalize_</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">GTMUILocalizerAndLayoutTweaker</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>localizerOwner_</string>
- <string>localizer_</string>
- <string>uiObject_</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>GTMUILocalizer</string>
- <string>id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="775374321">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">GTMWidthBasedTweaker</string>
- <string key="superclassName">NSView</string>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>viewToResize_</string>
- <string>viewToSlideAndResize_</string>
- <string>viewToSlide_</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>NSView</string>
- <string>NSView</string>
- </object>
- </object>
- <reference key="sourceIdentifier" ref="775374321"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/objc_zombie.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/status_bubble_mac.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/chrome_browser_window.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/themed_window.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">SyncCustomizeController</string>
- <string key="superclassName">NSWindowController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>endSheetWithCancel:</string>
- <string>endSheetWithOK:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">customizeSyncDescriptionTextField_</string>
- <string key="NS.object.0">NSTextField</string>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/sync_customize_controller.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- </data>
-</archive>
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index 3bc8ef6..039ac6f 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -28,7 +28,6 @@
#import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h"
#import "chrome/browser/cocoa/l10n_util.h"
#import "chrome/browser/cocoa/search_engine_list_model.h"
-#import "chrome/browser/cocoa/sync_customize_controller_cppsafe.h"
#import "chrome/browser/cocoa/vertical_gradient_view.h"
#import "chrome/browser/cocoa/window_size_autosaver.h"
#include "chrome/browser/download/download_manager.h"
@@ -1335,7 +1334,7 @@ const int kDisabledIndex = 1;
// "Personal Stuff" pane. Spawns a dialog-modal sheet that cleans
// itself up on close.
- (IBAction)doSyncCustomize:(id)sender {
- ShowSyncCustomizeDialog([self window], profile_->GetProfileSyncService());
+ syncService_->ShowChooseDataTypes();
}
- (IBAction)doSyncReauthentication:(id)sender {
diff --git a/chrome/browser/cocoa/sync_customize_controller.h b/chrome/browser/cocoa/sync_customize_controller.h
deleted file mode 100644
index 7115ed385..0000000
--- a/chrome/browser/cocoa/sync_customize_controller.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_COCOA_SYNC_CUSTOMIZE_CONTROLLER_H_
-#define CHROME_BROWSER_COCOA_SYNC_CUSTOMIZE_CONTROLLER_H_
-
-#import <Cocoa/Cocoa.h>
-
-#include "base/cocoa_protocols_mac.h"
-#include "chrome/browser/sync/syncable/model_type.h"
-
-class ProfileSyncService;
-
-// A window controller for the sheet that allows the user to customize
-// their sync data types.
-@interface SyncCustomizeController : NSWindowController <NSWindowDelegate> {
- @private
- ProfileSyncService* syncService_; // weak
-
- IBOutlet NSTextField* customizeSyncDescriptionTextField_;
-
- // The member variables below are connected to the dialog with KVO.
-
- // The registered flags indicate which model types are enabled for
- // syncing.
- BOOL bookmarksRegistered_;
- BOOL preferencesRegistered_;
- BOOL autofillRegistered_;
- BOOL themesRegistered_;
- BOOL extensionsRegistered_;
-
- // The preferred flags indicate which model types the user would
- // like to sync.
- BOOL bookmarksPreferred_;
- BOOL preferencesPreferred_;
- BOOL autofillPreferred_;
- BOOL themesPreferred_;
- BOOL extensionsPreferred_;
-}
-
-// syncService cannot be NULL.
-- (id)initWithProfileSyncService:(ProfileSyncService*)syncService;
-
-// Run as a sheet modal to the given window.
-- (void)runAsModalSheet:(NSWindow*)parentWindow;
-
-// End the sheet without saving the new preferred data types.
-- (IBAction)endSheetWithCancel:(id)sender;
-
-// Save the new preferred data types and end the sheet.
-- (IBAction)endSheetWithOK:(id)sender;
-
-// Properties for bindings.
-@property (nonatomic, assign) BOOL bookmarksRegistered;
-@property (nonatomic, assign) BOOL preferencesRegistered;
-@property (nonatomic, assign) BOOL autofillRegistered;
-@property (nonatomic, assign) BOOL themesRegistered;
-@property (nonatomic, assign) BOOL extensionsRegistered;
-
-@property (nonatomic, assign) BOOL bookmarksPreferred;
-@property (nonatomic, assign) BOOL preferencesPreferred;
-@property (nonatomic, assign) BOOL autofillPreferred;
-@property (nonatomic, assign) BOOL themesPreferred;
-@property (nonatomic, assign) BOOL extensionsPreferred;
-
-@property (nonatomic, readonly) BOOL okEnabled;
-
-@end
-
-#endif // CHROME_BROWSER_COCOA_SYNC_CUSTOMIZE_CONTROLLER_H_
diff --git a/chrome/browser/cocoa/sync_customize_controller.mm b/chrome/browser/cocoa/sync_customize_controller.mm
deleted file mode 100644
index 9bb7cfe..0000000
--- a/chrome/browser/cocoa/sync_customize_controller.mm
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "chrome/browser/cocoa/sync_customize_controller.h"
-#import "chrome/browser/cocoa/sync_customize_controller_cppsafe.h"
-
-#include <algorithm>
-
-#include "base/basictypes.h"
-#include "base/logging.h"
-#import "base/mac_util.h"
-#import "base/stl_util-inl.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/syncable/model_type.h"
-#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
-
-
-@implementation SyncCustomizeController
-
-@synthesize bookmarksRegistered = bookmarksRegistered_;
-@synthesize preferencesRegistered = preferencesRegistered_;
-@synthesize autofillRegistered = autofillRegistered_;
-@synthesize themesRegistered = themesRegistered_;
-@synthesize extensionsRegistered = extensionsRegistered_;
-
-// If you add another ***Preferred variable, you must update okEnabled and
-// keyPathsForValuesAffectingOkEnabled below.
-@synthesize bookmarksPreferred = bookmarksPreferred_;
-@synthesize preferencesPreferred = preferencesPreferred_;
-@synthesize autofillPreferred = autofillPreferred_;
-@synthesize themesPreferred = themesPreferred_;
-@synthesize extensionsPreferred = extensionsPreferred_;
-
-// The OK button should be clickable if and only if there's at least one
-// datatype chosen to sync.
-- (BOOL)okEnabled {
- return bookmarksPreferred_ || preferencesPreferred_ || autofillPreferred_ ||
- themesPreferred_ || extensionsPreferred_;
-}
-
-// Naming convention; makes okEnabled get updated whenever any of the below
-// "Preferred" variables are updated.
-+ (NSSet*)keyPathsForValuesAffectingOkEnabled {
- return [NSSet setWithObjects:@"bookmarksPreferred", @"preferencesPreferred",
- @"autofillPreferred", @"themesPreferred",
- @"extensionsPreferred", nil];
-}
-
-- (id)initWithProfileSyncService:(ProfileSyncService*)syncService {
- NSString* nibpath = [mac_util::MainAppBundle()
- pathForResource:@"SyncCustomize"
- ofType:@"nib"];
- if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
- CHECK(syncService);
- syncService_ = syncService;
- }
- return self;
-}
-
-// Called when the sheet containing our window is dismissed.
-- (void)endSheet:(NSWindow*)sheet
- returnCode:(NSInteger)returnCode
- contextInfo:(void*)context {
- NSWindow* parentWindow = static_cast<NSWindow*>(context);
- [sheet close];
- [sheet orderOut:parentWindow];
-}
-
-- (void)runAsModalSheet:(NSWindow*)parentWindow {
- [NSApp beginSheet:[self window]
- modalForWindow:parentWindow
- modalDelegate:self
- didEndSelector:@selector(endSheet:returnCode:contextInfo:)
- contextInfo:parentWindow];
-}
-
-- (void)awakeFromNib {
- DCHECK([self window]);
- [[self window] setDelegate:self];
-
- CGFloat viewHeightChange =
- [GTMUILocalizerAndLayoutTweaker
- sizeToFitFixedWidthTextField:customizeSyncDescriptionTextField_];
- if (viewHeightChange > 0) {
- // Resize the window. No need to move the controls as they're all
- // bottom-anchored.
- NSSize viewSizeChange = NSMakeSize(0, viewHeightChange);
- NSSize windowSizeChange =
- [customizeSyncDescriptionTextField_ convertSize:viewSizeChange
- toView:nil];
- CGFloat windowHeightChange = windowSizeChange.height;
- NSRect frame = [[self window] frame];
- frame.origin.y -= windowHeightChange;
- frame.size.height += windowHeightChange;
- [[self window] setFrame:frame display:NO];
- }
-
- syncable::ModelTypeSet registered_types;
- syncService_->GetRegisteredDataTypes(&registered_types);
- const syncable::ModelType expected_types[] = {
- syncable::BOOKMARKS,
- syncable::PREFERENCES,
- syncable::AUTOFILL,
- syncable::THEMES,
- syncable::EXTENSIONS,
- };
- DCHECK(std::includes(expected_types,
- expected_types + arraysize(expected_types),
- registered_types.begin(), registered_types.end()));
- DCHECK(ContainsKey(registered_types, syncable::BOOKMARKS));
-
- [self setBookmarksRegistered:ContainsKey(registered_types,
- syncable::BOOKMARKS)];
- [self setPreferencesRegistered:ContainsKey(registered_types,
- syncable::PREFERENCES)];
- [self setAutofillRegistered:ContainsKey(registered_types,
- syncable::AUTOFILL)];
- [self setThemesRegistered:ContainsKey(registered_types,
- syncable::THEMES)];
- [self setExtensionsRegistered:ContainsKey(registered_types,
- syncable::EXTENSIONS)];
-
- syncable::ModelTypeSet preferred_types;
- syncService_->GetPreferredDataTypes(&preferred_types);
- DCHECK(std::includes(registered_types.begin(), registered_types.end(),
- preferred_types.begin(), preferred_types.end()));
-
- [self setBookmarksPreferred:ContainsKey(preferred_types,
- syncable::BOOKMARKS)];
- [self setPreferencesPreferred:ContainsKey(preferred_types,
- syncable::PREFERENCES)];
- [self setAutofillPreferred:ContainsKey(preferred_types,
- syncable::AUTOFILL)];
- [self setThemesPreferred:ContainsKey(preferred_types,
- syncable::THEMES)];
- [self setExtensionsPreferred:ContainsKey(preferred_types,
- syncable::EXTENSIONS)];
-}
-
-- (void)windowWillClose:(NSNotification*)notification {
- [self autorelease];
-}
-
-// Dismiss the sheet containing our window.
-- (void)endSheet {
- [NSApp endSheet:[self window]];
-}
-
-- (IBAction)endSheetWithCancel:(id)sender {
- [self endSheet];
-}
-
-// Commit the changes made by the user to the ProfileSyncService.
-- (void)changePreferredDataTypes {
- syncable::ModelTypeSet preferred_types;
- if ([self bookmarksPreferred]) {
- preferred_types.insert(syncable::BOOKMARKS);
- }
- if ([self preferencesPreferred]) {
- preferred_types.insert(syncable::PREFERENCES);
- }
- if ([self autofillPreferred]) {
- preferred_types.insert(syncable::AUTOFILL);
- }
- if ([self themesPreferred]) {
- preferred_types.insert(syncable::THEMES);
- }
- if ([self extensionsPreferred]) {
- preferred_types.insert(syncable::EXTENSIONS);
- }
- syncService_->ChangePreferredDataTypes(preferred_types);
- [self endSheet];
-}
-
-- (IBAction)endSheetWithOK:(id)sender {
- [self changePreferredDataTypes];
- [self endSheet];
-}
-
-@end
-
-void ShowSyncCustomizeDialog(gfx::NativeWindow parent_window,
- ProfileSyncService* sync_service) {
- // syncCustomizeController releases itself on close.
- SyncCustomizeController* syncCustomizeController =
- [[SyncCustomizeController alloc]
- initWithProfileSyncService:sync_service];
- [syncCustomizeController runAsModalSheet:parent_window];
-}
diff --git a/chrome/browser/cocoa/sync_customize_controller_cppsafe.h b/chrome/browser/cocoa/sync_customize_controller_cppsafe.h
deleted file mode 100644
index 1969652..0000000
--- a/chrome/browser/cocoa/sync_customize_controller_cppsafe.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_COCOA_SYNC_CUSTOMIZE_CONTROLLER_CPPSAFE_H_
-#define CHROME_BROWSER_COCOA_SYNC_CUSTOMIZE_CONTROLLER_CPPSAFE_H_
-
-class ProfileSyncService;
-
-#include "gfx/native_widget_types.h"
-
-// Implementation is in sync_customize_controller.mm.
-
-// Creates a sync customize dialog which is modal to parent_window.
-// The dialog automatically cleans itself up on close. It should be
-// impossible to close and destroy parent_window while the customize
-// dialog remains open.
-void ShowSyncCustomizeDialog(gfx::NativeWindow parent_window,
- ProfileSyncService* sync_service);
-
-#endif // CHROME_BROWSER_COCOA_SYNC_CUSTOMIZE_CONTROLLER_CPPSAFE_H_
diff --git a/chrome/browser/cocoa/sync_customize_controller_unittest.mm b/chrome/browser/cocoa/sync_customize_controller_unittest.mm
deleted file mode 100644
index 6c46a87..0000000
--- a/chrome/browser/cocoa/sync_customize_controller_unittest.mm
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "chrome/browser/cocoa/sync_customize_controller.h"
-#import "chrome/browser/cocoa/sync_customize_controller_cppsafe.h"
-
-#import <Cocoa/Cocoa.h>
-
-#import "chrome/browser/cocoa/cocoa_test_helper.h"
-#include "chrome/browser/sync/profile_sync_service_mock.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-
-using ::testing::_;
-using ::testing::SaveArg;
-using ::testing::SetArgumentPointee;
-
-class SyncCustomizeControllerTest : public CocoaTest {
- protected:
- virtual void SetUp() {
- CocoaTest::SetUp();
- syncable::ModelTypeSet initial_registered_types, initial_preferred_types;
- initial_registered_types.insert(syncable::BOOKMARKS);
- initial_registered_types.insert(syncable::PREFERENCES);
- initial_registered_types.insert(syncable::THEMES);
- initial_preferred_types.insert(syncable::PREFERENCES);
- EXPECT_CALL(sync_service_mock_, GetRegisteredDataTypes(_))
- .WillOnce(SetArgumentPointee<0>(initial_registered_types));
- EXPECT_CALL(sync_service_mock_, GetPreferredDataTypes(_))
- .WillOnce(SetArgumentPointee<0>(initial_preferred_types));
- }
-
- virtual SyncCustomizeController* MakeSyncCustomizeController() {
- return [[SyncCustomizeController alloc]
- initWithProfileSyncService:&sync_service_mock_];
- }
-
- ProfileSyncServiceMock sync_service_mock_;
-};
-
-TEST_F(SyncCustomizeControllerTest, InitialRead) {
- SyncCustomizeController* controller = MakeSyncCustomizeController();
- // Force nib load.
- [controller window];
-
- EXPECT_TRUE([controller bookmarksRegistered]);
- EXPECT_TRUE([controller preferencesRegistered]);
- EXPECT_FALSE([controller autofillRegistered]);
- EXPECT_TRUE([controller themesRegistered]);
-
- EXPECT_FALSE([controller bookmarksPreferred]);
- EXPECT_TRUE([controller preferencesPreferred]);
- EXPECT_FALSE([controller autofillPreferred]);
- EXPECT_FALSE([controller themesPreferred]);
-
- [controller close];
-}
-
-TEST_F(SyncCustomizeControllerTest, RunAsModalSheet) {
- SyncCustomizeController* controller = MakeSyncCustomizeController();
- [controller runAsModalSheet:test_window()];
- [controller endSheetWithCancel:nil];
-}
-
-TEST_F(SyncCustomizeControllerTest, ShowSyncCustomizeDialog) {
- ShowSyncCustomizeDialog(test_window(), &sync_service_mock_);
- id controller = [[test_window() attachedSheet] windowController];
- EXPECT_TRUE([controller isKindOfClass:[SyncCustomizeController class]]);
- [controller endSheetWithCancel:nil];
-}
-
-TEST_F(SyncCustomizeControllerTest, EndSheetWithCancel) {
- EXPECT_CALL(sync_service_mock_, ChangePreferredDataTypes(_)).Times(0);
-
- SyncCustomizeController* controller = MakeSyncCustomizeController();
- [controller runAsModalSheet:test_window()];
- [controller setPreferencesPreferred:NO];
- [controller setThemesPreferred:YES];
- [controller endSheetWithCancel:nil];
-
- // If ChangePreferredDataTypes() wasn't called, then that means the
- // changes weren't committed.
-}
-
-TEST_F(SyncCustomizeControllerTest, EndSheetWithOK) {
- syncable::ModelTypeSet preferred_types;
- EXPECT_CALL(sync_service_mock_, ChangePreferredDataTypes(_))
- .WillOnce(SaveArg<0>(&preferred_types));
-
- SyncCustomizeController* controller = MakeSyncCustomizeController();
- [controller runAsModalSheet:test_window()];
- [controller setPreferencesPreferred:NO];
- [controller setThemesPreferred:YES];
- [controller endSheetWithOK:nil];
-
- syncable::ModelTypeSet expected_preferred_types;
- expected_preferred_types.insert(syncable::THEMES);
- EXPECT_TRUE(preferred_types == expected_preferred_types);
-}
-
-TEST_F(SyncCustomizeControllerTest, CannotSelectZeroTypes) {
- SyncCustomizeController* controller = MakeSyncCustomizeController();
- [controller runAsModalSheet:test_window()];
- [controller setBookmarksPreferred:NO];
- [controller setPreferencesPreferred:NO];
- [controller setAutofillPreferred:NO];
- [controller setThemesPreferred:NO];
-
- EXPECT_FALSE([controller okEnabled]);
-
- // If any data types are enabled, "OK" should be enabled too.
- [controller setBookmarksPreferred:NO];
- [controller setPreferencesPreferred:YES];
- [controller setAutofillPreferred:NO];
- [controller setThemesPreferred:NO];
-
- EXPECT_TRUE([controller okEnabled]);
-
- [controller endSheetWithCancel:nil];
-}
-
-} // namespace
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index 0642e9e..3267d84 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -18,7 +18,6 @@
#include "chrome/browser/gtk/gtk_theme_provider.h"
#include "chrome/browser/gtk/gtk_util.h"
#include "chrome/browser/gtk/import_dialog_gtk.h"
-#include "chrome/browser/gtk/options/customize_sync_window_gtk.h"
#include "chrome/browser/gtk/options/options_layout_gtk.h"
#include "chrome/browser/gtk/options/passwords_exceptions_window_gtk.h"
#include "chrome/browser/importer/importer_data_types.h"
@@ -605,7 +604,7 @@ void ContentPageGtk::OnSyncStartStopButtonClicked(GtkWidget* widget) {
void ContentPageGtk::OnSyncCustomizeButtonClicked(GtkWidget* widget) {
// sync_customize_button_ should be invisible if sync is not yet set up.
DCHECK(sync_service_->HasSyncSetupCompleted());
- ShowCustomizeSyncWindow(profile());
+ sync_service_->ShowChooseDataTypes();
}
void ContentPageGtk::OnSyncActionLinkClicked(GtkWidget* widget) {
diff --git a/chrome/browser/gtk/options/customize_sync_window_gtk.cc b/chrome/browser/gtk/options/customize_sync_window_gtk.cc
deleted file mode 100644
index 3f10c85..0000000
--- a/chrome/browser/gtk/options/customize_sync_window_gtk.cc
+++ /dev/null
@@ -1,305 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/gtk/options/customize_sync_window_gtk.h"
-
-#include <gtk/gtk.h>
-
-#include <string>
-
-#include "app/gtk_signal.h"
-#include "app/l10n_util.h"
-#include "base/message_loop.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/options_window.h"
-#include "chrome/browser/pref_service.h"
-#include "chrome/browser/profile.h"
-#include "chrome/browser/sync/glue/data_type_controller.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/common/pref_names.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "grit/locale_settings.h"
-
-///////////////////////////////////////////////////////////////////////////////
-// CustomizeSyncWindowGtk
-//
-// The contents of the Customize Sync dialog window.
-
-class CustomizeSyncWindowGtk {
- public:
- explicit CustomizeSyncWindowGtk(Profile* profile);
- ~CustomizeSyncWindowGtk();
-
- void Show();
- bool ClickOk();
- void ClickCancel();
-
- private:
- // The pixel width we wrap labels at.
- static const int kWrapWidth = 475;
-
- GtkWidget* AddCheckbox(GtkWidget* parent, int label_id, bool checked);
- bool Accept();
-
- static void OnWindowDestroy(GtkWidget* widget,
- CustomizeSyncWindowGtk* window);
-
- static void OnResponse(GtkDialog* dialog, gint response_id,
- CustomizeSyncWindowGtk* customize_sync_window);
-
- CHROMEGTK_CALLBACK_0(CustomizeSyncWindowGtk, void, OnCheckboxClicked);
-
- // Utility methods to safely determine the state of optional checkboxes.
- static bool BoxChecked(GtkWidget* check_box) {
- return check_box &&
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_box));
- }
- bool BookmarksChecked() const { return BoxChecked(bookmarks_check_box_); }
- bool PreferencesChecked() const { return BoxChecked(preferences_check_box_); }
- bool ThemesChecked() const { return BoxChecked(themes_check_box_); }
- bool ExtensionsChecked() const { return BoxChecked(extensions_check_box_); }
- bool AutofillChecked() const { return BoxChecked(autofill_check_box_); }
- bool TypedUrlsChecked() const { return BoxChecked(typed_urls_check_box_); }
-
- // The customize sync dialog.
- GtkWidget* dialog_;
-
- Profile* profile_;
-
- GtkWidget* description_label_;
- GtkWidget* bookmarks_check_box_;
- GtkWidget* preferences_check_box_;
- GtkWidget* themes_check_box_;
- GtkWidget* extensions_check_box_;
- GtkWidget* autofill_check_box_;
- GtkWidget* typed_urls_check_box_;
-
- // Helper object to manage accessibility metadata.
- scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_;
-
- DISALLOW_COPY_AND_ASSIGN(CustomizeSyncWindowGtk);
-};
-
-// The singleton customize sync window object.
-static CustomizeSyncWindowGtk* customize_sync_window = NULL;
-
-///////////////////////////////////////////////////////////////////////////////
-// CustomizeSyncWindowGtk, public:
-
-CustomizeSyncWindowGtk::CustomizeSyncWindowGtk(Profile* profile)
- : profile_(profile),
- description_label_(NULL),
- bookmarks_check_box_(NULL),
- preferences_check_box_(NULL),
- themes_check_box_(NULL),
- extensions_check_box_(NULL),
- autofill_check_box_(NULL),
- typed_urls_check_box_(NULL) {
- syncable::ModelTypeSet registered_types;
- profile_->GetProfileSyncService()->GetRegisteredDataTypes(&registered_types);
- syncable::ModelTypeSet preferred_types;
- profile_->GetProfileSyncService()->GetPreferredDataTypes(&preferred_types);
-
- std::string dialog_name = l10n_util::GetStringUTF8(
- IDS_CUSTOMIZE_SYNC_WINDOW_TITLE);
- dialog_ = gtk_dialog_new_with_buttons(
- dialog_name.c_str(),
- // Customize sync window is shared between all browser windows.
- NULL,
- // Non-modal.
- GTK_DIALOG_NO_SEPARATOR,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
- GTK_RESPONSE_OK,
- NULL);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
- gtk_util::kContentAreaSpacing);
-
- accessible_widget_helper_.reset(new AccessibleWidgetHelper(
- dialog_, profile));
- accessible_widget_helper_->SendOpenWindowNotification(dialog_name);
-
- GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
-
- description_label_ = gtk_label_new(l10n_util::GetStringUTF8(
- IDS_CUSTOMIZE_SYNC_DESCRIPTION).c_str());
- gtk_label_set_line_wrap(GTK_LABEL(description_label_), TRUE);
- gtk_widget_set_size_request(description_label_, kWrapWidth, -1);
- gtk_box_pack_start(GTK_BOX(vbox), description_label_, FALSE, FALSE, 0);
-
- accessible_widget_helper_->SetWidgetName(description_label_,
- IDS_CUSTOMIZE_SYNC_DESCRIPTION);
-
- DCHECK(registered_types.count(syncable::BOOKMARKS));
- bool bookmarks_checked = preferred_types.count(syncable::BOOKMARKS) != 0;
- bookmarks_check_box_ = AddCheckbox(vbox, IDS_SYNC_DATATYPE_BOOKMARKS,
- bookmarks_checked);
-
- if (registered_types.count(syncable::PREFERENCES)) {
- bool prefs_checked = preferred_types.count(syncable::PREFERENCES) != 0;
- preferences_check_box_ = AddCheckbox(vbox, IDS_SYNC_DATATYPE_PREFERENCES,
- prefs_checked);
- }
-
- if (registered_types.count(syncable::THEMES)) {
- bool themes_checked = preferred_types.count(syncable::THEMES) != 0;
- themes_check_box_ = AddCheckbox(vbox, IDS_SYNC_DATATYPE_THEMES,
- themes_checked);
- }
-
- if (registered_types.count(syncable::EXTENSIONS)) {
- bool extensions_checked = preferred_types.count(syncable::EXTENSIONS) != 0;
- extensions_check_box_ = AddCheckbox(vbox, IDS_SYNC_DATATYPE_EXTENSIONS,
- extensions_checked);
- }
-
- if (registered_types.count(syncable::AUTOFILL)) {
- bool autofill_checked = preferred_types.count(syncable::AUTOFILL) != 0;
- autofill_check_box_ = AddCheckbox(vbox, IDS_SYNC_DATATYPE_AUTOFILL,
- autofill_checked);
- }
-
- if (registered_types.count(syncable::TYPED_URLS)) {
- bool typed_urls_checked = preferred_types.count(syncable::TYPED_URLS) != 0;
- typed_urls_check_box_ = AddCheckbox(vbox, IDS_SYNC_DATATYPE_TYPED_URLS,
- typed_urls_checked);
- }
-
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_)->vbox), vbox, FALSE, FALSE, 0);
-
- gtk_widget_realize(dialog_);
- gtk_util::SetWindowSizeFromResources(GTK_WINDOW(dialog_),
- IDS_CUSTOMIZE_SYNC_DIALOG_WIDTH_CHARS,
- IDS_CUSTOMIZE_SYNC_DIALOG_HEIGHT_LINES,
- true);
-
- g_signal_connect(dialog_, "response", G_CALLBACK(OnResponse), this);
- g_signal_connect(dialog_, "destroy", G_CALLBACK(OnWindowDestroy), this);
-
- gtk_util::ShowDialog(dialog_);
-}
-
-CustomizeSyncWindowGtk::~CustomizeSyncWindowGtk() {
-}
-
-void CustomizeSyncWindowGtk::Show() {
- // Bring options window to front if it already existed and isn't already
- // in front
- gtk_util::PresentWindow(dialog_, 0);
-}
-
-bool CustomizeSyncWindowGtk::ClickOk() {
-
- if (BookmarksChecked() || PreferencesChecked() || ThemesChecked() ||
- ExtensionsChecked() || AutofillChecked() || TypedUrlsChecked()) {
- Accept();
- gtk_widget_destroy(GTK_WIDGET(dialog_));
- return true;
- } else {
- // show the user that something's wrong with this dialog (not perfect, but
- // a temporary fix)
- gtk_util::PresentWindow(dialog_, 0);
- return false;
- }
-}
-
-void CustomizeSyncWindowGtk::ClickCancel() {
- gtk_widget_destroy(GTK_WIDGET(dialog_));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// CustomizeSyncWindowGtk, private:
-
-GtkWidget* CustomizeSyncWindowGtk::AddCheckbox(GtkWidget* parent, int label_id,
- bool checked) {
-
- GtkWidget* checkbox = gtk_check_button_new_with_label(
- l10n_util::GetStringUTF8(label_id).c_str());
-
- gtk_box_pack_start(GTK_BOX(parent), checkbox, FALSE, FALSE, 0);
- accessible_widget_helper_->SetWidgetName(checkbox, label_id);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), checked);
-
- g_signal_connect(checkbox, "clicked", G_CALLBACK(OnCheckboxClickedThunk),
- this);
-
- return checkbox;
-}
-
-bool CustomizeSyncWindowGtk::Accept() {
- syncable::ModelTypeSet preferred_types;
-
- if (BookmarksChecked())
- preferred_types.insert(syncable::BOOKMARKS);
- if (PreferencesChecked())
- preferred_types.insert(syncable::PREFERENCES);
- if (ThemesChecked())
- preferred_types.insert(syncable::THEMES);
- if (ExtensionsChecked())
- preferred_types.insert(syncable::EXTENSIONS);
- if (AutofillChecked())
- preferred_types.insert(syncable::AUTOFILL);
- if (TypedUrlsChecked())
- preferred_types.insert(syncable::TYPED_URLS);
-
- profile_->GetProfileSyncService()->ChangePreferredDataTypes(preferred_types);
- return true;
-}
-
-// static
-void CustomizeSyncWindowGtk::OnWindowDestroy(GtkWidget* widget,
- CustomizeSyncWindowGtk* window) {
- customize_sync_window = NULL;
- MessageLoop::current()->DeleteSoon(FROM_HERE, window);
-}
-
-// static
-void CustomizeSyncWindowGtk::OnResponse(
- GtkDialog* dialog, gint response_id,
- CustomizeSyncWindowGtk* customize_sync_window) {
- if (response_id == GTK_RESPONSE_OK)
- customize_sync_window->ClickOk();
- else if (response_id == GTK_RESPONSE_CANCEL)
- customize_sync_window->ClickCancel();
-}
-
-// Deactivate the "OK" button if you uncheck all the data types.
-void CustomizeSyncWindowGtk::OnCheckboxClicked(GtkWidget* widget) {
- if (BookmarksChecked() || PreferencesChecked() || ThemesChecked() ||
- ExtensionsChecked() || AutofillChecked() || TypedUrlsChecked()) {
- gtk_dialog_set_response_sensitive(
- GTK_DIALOG(customize_sync_window->dialog_), GTK_RESPONSE_OK, TRUE);
- } else {
- gtk_dialog_set_response_sensitive(
- GTK_DIALOG(customize_sync_window->dialog_), GTK_RESPONSE_OK, FALSE);
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Factory/finder method:
-
-void ShowCustomizeSyncWindow(Profile* profile) {
- DCHECK(profile);
- // If there's already an existing window, use it.
- if (!customize_sync_window)
- customize_sync_window = new CustomizeSyncWindowGtk(profile);
-
- customize_sync_window->Show();
-}
-
-bool CustomizeSyncWindowOk() {
- if (customize_sync_window)
- return customize_sync_window->ClickOk();
-
- return true;
-}
-
-void CustomizeSyncWindowCancel() {
- if (customize_sync_window)
- customize_sync_window->ClickCancel();
-}
diff --git a/chrome/browser/gtk/options/customize_sync_window_gtk.h b/chrome/browser/gtk/options/customize_sync_window_gtk.h
deleted file mode 100644
index 009b6f2..0000000
--- a/chrome/browser/gtk/options/customize_sync_window_gtk.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_GTK_OPTIONS_CUSTOMIZE_SYNC_WINDOW_GTK_H_
-#define CHROME_BROWSER_GTK_OPTIONS_CUSTOMIZE_SYNC_WINDOW_GTK_H_
-
-class Profile;
-
-void ShowCustomizeSyncWindow(Profile* profile);
-bool CustomizeSyncWindowOk();
-void CustomizeSyncWindowCancel();
-
-#endif // CHROME_BROWSER_GTK_OPTIONS_CUSTOMIZE_SYNC_WINDOW_GTK_H_
diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h
index 75fa615..ae9832f 100644
--- a/chrome/browser/sync/profile_sync_service_mock.h
+++ b/chrome/browser/sync/profile_sync_service_mock.h
@@ -28,7 +28,6 @@ class ProfileSyncServiceMock : public ProfileSyncService {
void(const std::string& username,
const std::string& password,
const std::string& captcha));
- MOCK_METHOD0(OnUserAcceptedMergeAndSync, void());
MOCK_METHOD0(OnUserCancelledDialog, void());
MOCK_CONST_METHOD0(GetAuthenticatedUsername, string16());
MOCK_METHOD2(OnUnrecoverableError,
diff --git a/chrome/browser/sync/resources/gaia_login_test.html b/chrome/browser/sync/resources/gaia_login_test.html
index 6de84a9..fe50af6 100644
--- a/chrome/browser/sync/resources/gaia_login_test.html
+++ b/chrome/browser/sync/resources/gaia_login_test.html
@@ -44,7 +44,6 @@ function set_up_testing() {
win.JSON = {};
win.JSON.parse = function() {
return {
- showCustomize: form.show_customize.checked,
error: get_selected_value(form.error),
user: "homer@gmail.com",
captchaUrl: "https://www.google.com/accounts/Captcha"
@@ -74,7 +73,6 @@ function set_up_testing() {
set_text("cannotaccessaccount", "I cannot access my account");
set_text("href:createnewaccounturl", "href:createnewaccounturl");
set_text("createaccount", "Create a Google account");
- set_text("value:customize", "Customize sync...");
set_text("value:cancel", "Cancel");
function set_text(id, text) {
@@ -112,7 +110,6 @@ function update() {
</iframe>
<div id="options">
<form id="form" name="form">
-<p><input name="show_customize" type="checkbox" checked> Show customize</p>
<p>
<input type="radio" name="error" value="" checked> No Error
<input type="radio" name="error" value="1"> Bad Password
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index 2cecbc7..84cbf11 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -37,16 +37,6 @@ static const wchar_t* kChooseDataTypesIFrameXPath =
static const wchar_t* kDoneIframeXPath = L"//iframe[@id='done']";
void FlowHandler::RegisterMessages() {
- dom_ui_->RegisterMessageCallback("ShowCustomize",
- NewCallback(this, &FlowHandler::HandleUserClickedCustomize));
- // On OS X, the customize dialog is modal to the HTML window so we
- // don't need to hook up the two functions below.
-#if defined(OS_WIN) || defined(OS_LINUX)
- dom_ui_->RegisterMessageCallback("ClickCustomizeOk",
- NewCallback(this, &FlowHandler::ClickCustomizeOk));
- dom_ui_->RegisterMessageCallback("ClickCustomizeCancel",
- NewCallback(this, &FlowHandler::ClickCustomizeCancel));
-#endif
dom_ui_->RegisterMessageCallback("SubmitAuth",
NewCallback(this, &FlowHandler::HandleSubmitAuth));
dom_ui_->RegisterMessageCallback("ChooseDataTypes",
@@ -125,42 +115,12 @@ static bool GetDataTypeChoiceData(const std::string& json,
return true;
}
-void FlowHandler::HandleUserClickedCustomize(const Value* value) {
- if (flow_)
- flow_->OnUserClickedCustomize();
-}
-
-// To simulate the user clicking "OK" or "Cancel" on the Customize Sync dialog
-void FlowHandler::ClickCustomizeOk(const Value* value) {
- if (flow_)
- flow_->ClickCustomizeOk();
-}
-
-void FlowHandler::ClickCustomizeCancel(const Value* value) {
- if (flow_)
- flow_->ClickCustomizeCancel();
-}
-
-
void FlowHandler::HandleSubmitAuth(const Value* value) {
std::string json(dom_ui_util::GetJsonResponseFromFirstArgumentInList(value));
std::string username, password, captcha;
if (json.empty())
return;
- // If ClickOk() returns false (indicating that there's a problem in the
- // CustomizeSyncWindowView), don't do anything; the CSWV will focus itself,
- // indicating that there's something to do there.
- // ClickOk() has no side effects if the singleton dialog is not present.
- if (!flow_->ClickCustomizeOk()) {
- // TODO(dantasse): this results in a kinda ugly experience for this edge
- // case; come back here and add a nice message explaining that you can't
- // sync zero datatypes. (OR just make the CSWV modal to the Gaia Login
- // box, like we want to do anyway.
- flow_->Advance(SyncSetupWizard::GAIA_LOGIN);
- return;
- }
-
if (!GetAuthData(json, &username, &password, &captcha)) {
// The page sent us something that we didn't understand.
// This probably indicates a programming error.
@@ -172,7 +132,6 @@ void FlowHandler::HandleSubmitAuth(const Value* value) {
flow_->OnUserSubmittedAuth(username, password, captcha);
}
-
void FlowHandler::HandleChooseDataTypes(const Value* value) {
std::string json(dom_ui_util::GetJsonResponseFromFirstArgumentInList(value));
bool sync_everything;
@@ -370,8 +329,6 @@ void SyncSetupFlow::GetArgsForGaiaLogin(const ProfileSyncService* service,
}
args->SetString(L"captchaUrl", error.captcha().image_url.spec());
-
- args->SetBoolean(L"showCustomize", true);
}
// static
diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h
index dcc7fe7..a80fb98 100644
--- a/chrome/browser/sync/sync_setup_flow.h
+++ b/chrome/browser/sync/sync_setup_flow.h
@@ -14,13 +14,6 @@
#include "chrome/browser/dom_ui/html_dialog_ui.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/sync_setup_wizard.h"
-#if defined(OS_WIN)
-#include "chrome/browser/views/options/customize_sync_window_view.h"
-#elif defined(OS_LINUX)
-#include "chrome/browser/gtk/options/customize_sync_window_gtk.h"
-#elif defined(OS_MACOSX)
-#include "chrome/browser/cocoa/sync_customize_controller_cppsafe.h"
-#endif
#include "gfx/native_widget_types.h"
#include "grit/generated_resources.h"
@@ -96,36 +89,6 @@ class SyncSetupFlow : public HtmlDialogUIDelegate {
return false;
}
- void OnUserClickedCustomize() {
-#if defined(OS_WIN)
- CustomizeSyncWindowView::Show(NULL, service_->profile());
-#elif defined(OS_LINUX)
- ShowCustomizeSyncWindow(service_->profile());
-#elif defined(OS_MACOSX)
- DCHECK(html_dialog_window_);
- ShowSyncCustomizeDialog(html_dialog_window_, service_);
-#endif
- }
-
- bool ClickCustomizeOk() {
-#if defined(OS_WIN)
- return CustomizeSyncWindowView::ClickOk();
-#elif defined(OS_LINUX)
- return CustomizeSyncWindowOk();
-#else
- return true;
-#endif
- }
-
- void ClickCustomizeCancel() {
-#if defined(OS_WIN)
- CustomizeSyncWindowView::ClickCancel();
-#elif defined(OS_LINUX)
- CustomizeSyncWindowCancel();
-#endif
- }
-
-
void OnUserSubmittedAuth(const std::string& username,
const std::string& password,
const std::string& captcha) {
@@ -140,7 +103,6 @@ class SyncSetupFlow : public HtmlDialogUIDelegate {
private:
FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InitialStepLogin);
FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, ChooseDataTypesSetsPrefs);
- FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InitialStepMergeAndSync);
FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DialogCancelled);
FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InvalidTransitions);
FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, FullSuccessfulRunSetsPref);
@@ -211,12 +173,8 @@ class FlowHandler : public DOMMessageHandler {
virtual void RegisterMessages();
// Callbacks from the page.
- void HandleUserClickedCustomize(const Value* value);
- void ClickCustomizeOk(const Value* value);
- void ClickCustomizeCancel(const Value* value);
void HandleSubmitAuth(const Value* value);
void HandleChooseDataTypes(const Value* value);
- void HandleSubmitMergeAndSync(const Value* value);
// These functions control which part of the HTML is visible.
void ShowGaiaLogin(const DictionaryValue& args);
diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc
index 9d62a61..87e016d 100644
--- a/chrome/browser/sync/sync_setup_wizard.cc
+++ b/chrome/browser/sync/sync_setup_wizard.cc
@@ -111,8 +111,6 @@ void SyncResourcesSource::StartDataRequest(const std::string& path_raw,
l10n_util::GetString(IDS_SYNC_CREATE_ACCOUNT));
localized_strings.SetString(L"cancel",
l10n_util::GetString(IDS_CANCEL));
- localized_strings.SetString(L"customize",
- l10n_util::GetString(IDS_SYNC_LOGIN_CUSTOMIZE));
localized_strings.SetString(L"settingup",
l10n_util::GetString(IDS_SYNC_LOGIN_SETTING_UP));
localized_strings.SetString(L"success",
diff --git a/chrome/browser/sync/sync_setup_wizard_unittest.cc b/chrome/browser/sync/sync_setup_wizard_unittest.cc
index 7d170b9..0644501 100644
--- a/chrome/browser/sync/sync_setup_wizard_unittest.cc
+++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc
@@ -32,7 +32,6 @@ class ProfileSyncServiceForWizardTest : public ProfileSyncService {
public:
ProfileSyncServiceForWizardTest(ProfileSyncFactory* factory, Profile* profile)
: ProfileSyncService(factory, profile, false),
- user_accepted_merge_and_sync_(false),
user_cancelled_dialog_(false) {
RegisterPreferences();
ResetTestStats();
@@ -54,9 +53,6 @@ class ProfileSyncServiceForWizardTest : public ProfileSyncService {
chosen_data_types_ = chosen_types;
}
- virtual void OnUserAcceptedMergeAndSync() {
- user_accepted_merge_and_sync_ = true;
- }
virtual void OnUserCancelledDialog() {
user_cancelled_dialog_ = true;
}
@@ -75,7 +71,6 @@ class ProfileSyncServiceForWizardTest : public ProfileSyncService {
username_.clear();
password_.clear();
captcha_.clear();
- user_accepted_merge_and_sync_ = false;
user_cancelled_dialog_ = false;
user_chose_data_types_ = false;
keep_everything_synced_ = false;
@@ -85,7 +80,6 @@ class ProfileSyncServiceForWizardTest : public ProfileSyncService {
std::string username_;
std::string password_;
std::string captcha_;
- bool user_accepted_merge_and_sync_;
bool user_cancelled_dialog_;
bool user_chose_data_types_;
bool keep_everything_synced_;
@@ -244,7 +238,6 @@ TEST_F(SyncSetupWizardTest, InitialStepLogin) {
EXPECT_EQ(kTestUser, service_->username_);
EXPECT_EQ(kTestPassword, service_->password_);
EXPECT_EQ(kTestCaptcha, service_->captcha_);
- EXPECT_FALSE(service_->user_accepted_merge_and_sync_);
EXPECT_FALSE(service_->user_cancelled_dialog_);
service_->ResetTestStats();
@@ -257,7 +250,7 @@ TEST_F(SyncSetupWizardTest, InitialStepLogin) {
EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, test_window_->flow()->current_state_);
dialog_args.Clear();
SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
- EXPECT_EQ(5U, dialog_args.size());
+ EXPECT_EQ(4U, dialog_args.size());
std::string iframe_to_show;
dialog_args.GetString(L"iframeToShow", &iframe_to_show);
EXPECT_EQ("login", iframe_to_show);
@@ -275,7 +268,7 @@ TEST_F(SyncSetupWizardTest, InitialStepLogin) {
service_->set_auth_state(kTestUser, captcha_error);
wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
- EXPECT_EQ(5U, dialog_args.size());
+ EXPECT_EQ(4U, dialog_args.size());
dialog_args.GetString(L"iframeToShow", &iframe_to_show);
EXPECT_EQ("login", iframe_to_show);
std::string captcha_url;
@@ -343,7 +336,6 @@ TEST_F(SyncSetupWizardTest, DialogCancelled) {
EXPECT_TRUE(service_->user_cancelled_dialog_);
EXPECT_EQ(std::string(), service_->username_);
EXPECT_EQ(std::string(), service_->password_);
- EXPECT_FALSE(service_->user_accepted_merge_and_sync_);
wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
EXPECT_TRUE(wizard_->IsVisible());
@@ -356,7 +348,6 @@ TEST_F(SyncSetupWizardTest, DialogCancelled) {
EXPECT_TRUE(service_->user_cancelled_dialog_);
EXPECT_EQ(std::string(), service_->username_);
EXPECT_EQ(std::string(), service_->password_);
- EXPECT_FALSE(service_->user_accepted_merge_and_sync_);
}
TEST_F(SyncSetupWizardTest, InvalidTransitions) {
@@ -426,7 +417,7 @@ TEST_F(SyncSetupWizardTest, DiscreteRun) {
wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
EXPECT_TRUE(wizard_->IsVisible());
SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
- EXPECT_EQ(5U, dialog_args.size());
+ EXPECT_EQ(4U, dialog_args.size());
std::string iframe_to_show;
dialog_args.GetString(L"iframeToShow", &iframe_to_show);
EXPECT_EQ("login", iframe_to_show);
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index cd98939..add146e 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/sync/sync_ui_util.h"
#include "chrome/browser/sync/sync_setup_wizard.h"
#include "chrome/browser/views/importer_view.h"
-#include "chrome/browser/views/options/customize_sync_window_view.h"
#include "chrome/browser/views/options/options_group_view.h"
#include "chrome/browser/views/options/passwords_exceptions_window_view.h"
#include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/views/options/customize_sync_window_view.cc b/chrome/browser/views/options/customize_sync_window_view.cc
deleted file mode 100644
index 8907f3d..0000000
--- a/chrome/browser/views/options/customize_sync_window_view.cc
+++ /dev/null
@@ -1,284 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/pref_service.h"
-#include "chrome/browser/profile.h"
-#include "chrome/browser/sync/glue/data_type_controller.h"
-#include "chrome/browser/sync/glue/data_type_manager.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/syncable/model_type.h"
-#include "chrome/browser/views/options/customize_sync_window_view.h"
-#include "chrome/common/pref_names.h"
-#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
-#include "gfx/font.h"
-#include "grit/generated_resources.h"
-#include "grit/locale_settings.h"
-#include "views/controls/button/button.h"
-#include "views/controls/button/checkbox.h"
-#include "views/controls/label.h"
-#include "views/standard_layout.h"
-#include "views/window/window.h"
-
-// static
-CustomizeSyncWindowView* CustomizeSyncWindowView::instance_ = NULL;
-
-CustomizeSyncWindowView::CustomizeSyncWindowView(Profile* profile)
- : profile_(profile),
- description_label_(NULL),
- bookmarks_check_box_(NULL),
- preferences_check_box_(NULL),
- themes_check_box_(NULL),
- extensions_check_box_(NULL),
- autofill_check_box_(NULL) {
- DCHECK(profile);
- Init();
-}
-
-// static
-void CustomizeSyncWindowView::Show(gfx::NativeWindow parent_window,
- Profile* profile) {
- DCHECK(profile);
- if (!instance_) {
- instance_ = new CustomizeSyncWindowView(profile);
-
- // |instance_| will get deleted once Close() is called.
- views::Window::CreateChromeWindow(parent_window, gfx::Rect(), instance_);
- }
- if (!instance_->window()->IsVisible()) {
- instance_->window()->Show();
- } else {
- instance_->window()->Activate();
- }
-}
-
-// static
-bool CustomizeSyncWindowView::ClickOk() {
- if (instance_) {
- if (instance_->IsDialogButtonEnabled(MessageBoxFlags::DIALOGBUTTON_OK)) {
- instance_->Accept();
- instance_->window()->Close();
- return true;
- } else {
- instance_->Focus();
- return false;
- }
- } else {
- return true;
- }
-}
-
-// static
-void CustomizeSyncWindowView::ClickCancel() {
- if (instance_) {
- instance_->Cancel();
- instance_->window()->Close();
- }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CustomizeSyncWindowView, views::View implementations
-
-void CustomizeSyncWindowView::Layout() {
- gfx::Size sz = description_label_->GetPreferredSize();
- description_label_->SetBounds(kPanelHorizMargin, kPanelVertMargin,
- sz.width(), sz.height());
-
- sz = bookmarks_check_box_->GetPreferredSize();
- bookmarks_check_box_->SetBounds(2 * kPanelHorizMargin,
- description_label_->y() +
- description_label_->height() +
- kRelatedControlVerticalSpacing,
- sz.width(), sz.height());
-
- View* last_view = bookmarks_check_box_;
- if (preferences_check_box_) {
- sz = preferences_check_box_->GetPreferredSize();
- preferences_check_box_->SetBounds(2 * kPanelHorizMargin,
- last_view->y() +
- last_view->height() +
- kRelatedControlVerticalSpacing,
- sz.width(), sz.height());
- last_view = preferences_check_box_;
- }
-
- if (themes_check_box_) {
- sz = themes_check_box_->GetPreferredSize();
- themes_check_box_->SetBounds(2 * kPanelHorizMargin,
- last_view->y() +
- last_view->height() +
- kRelatedControlVerticalSpacing,
- sz.width(), sz.height());
- last_view = themes_check_box_;
- }
-
- if (extensions_check_box_) {
- sz = extensions_check_box_->GetPreferredSize();
- extensions_check_box_->SetBounds(2 * kPanelHorizMargin,
- last_view->y() +
- last_view->height() +
- kRelatedControlVerticalSpacing,
- sz.width(), sz.height());
- last_view = extensions_check_box_;
- }
-
- if (autofill_check_box_) {
- sz = autofill_check_box_->GetPreferredSize();
- autofill_check_box_->SetBounds(2 * kPanelHorizMargin,
- last_view->y() +
- last_view->height() +
- kRelatedControlVerticalSpacing,
- sz.width(), sz.height());
- last_view = autofill_check_box_;
- }
-
-}
-
-gfx::Size CustomizeSyncWindowView::GetPreferredSize() {
- return gfx::Size(views::Window::GetLocalizedContentsSize(
- IDS_CUSTOMIZE_SYNC_DIALOG_WIDTH_CHARS,
- IDS_CUSTOMIZE_SYNC_DIALOG_HEIGHT_LINES));
-}
-
-void CustomizeSyncWindowView::ViewHierarchyChanged(
- bool is_add, views::View* parent, views::View* child) {
- if (is_add && child == this)
- Init();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CustomizeSyncWindowView, views::DialogDelegate implementations
-
-bool CustomizeSyncWindowView::Accept() {
- syncable::ModelTypeSet desired_types;
-
- if (bookmarks_check_box_->checked()) {
- desired_types.insert(syncable::BOOKMARKS);
- }
- if (preferences_check_box_ && preferences_check_box_->checked()) {
- desired_types.insert(syncable::PREFERENCES);
- }
- if (themes_check_box_ && themes_check_box_->checked()) {
- desired_types.insert(syncable::THEMES);
- }
- if (extensions_check_box_ && extensions_check_box_->checked()) {
- desired_types.insert(syncable::EXTENSIONS);
- }
- if (autofill_check_box_ && autofill_check_box_->checked()) {
- desired_types.insert(syncable::AUTOFILL);
- }
-
- // You shouldn't be able to accept if you've selected 0 datatypes.
- DCHECK(!desired_types.empty());
- profile_->GetProfileSyncService()->ChangePreferredDataTypes(desired_types);
-
- return true;
-}
-
-int CustomizeSyncWindowView::GetDialogButtons() const {
- return MessageBoxFlags::DIALOGBUTTON_OK |
- MessageBoxFlags::DIALOGBUTTON_CANCEL;
-}
-
-bool CustomizeSyncWindowView::IsDialogButtonEnabled(
- MessageBoxFlags::DialogButton button) const {
- switch (button) {
- case MessageBoxFlags::DIALOGBUTTON_OK:
- // The OK button should be enabled if any checkbox is checked.
- return bookmarks_check_box_->checked() ||
- (preferences_check_box_ && preferences_check_box_->checked()) ||
- (autofill_check_box_ && autofill_check_box_->checked()) ||
- (themes_check_box_ && themes_check_box_->checked()) ||
- (extensions_check_box_ && extensions_check_box_->checked());
- case MessageBoxFlags::DIALOGBUTTON_CANCEL:
- return true;
- default:
- NOTREACHED() << "CustomizeSyncWindowView should only have OK and "
- << "Cancel buttons.";
- return false;
- }
-}
-
-std::wstring CustomizeSyncWindowView::GetWindowTitle() const {
- return l10n_util::GetString(IDS_CUSTOMIZE_SYNC_WINDOW_TITLE);
-}
-
-views::View* CustomizeSyncWindowView::GetContentsView() {
- return this;
-}
-
-void CustomizeSyncWindowView::WindowClosing() {
- // |instance_| is deleted once the window is closed, so we just have to set
- // it to NULL.
- instance_ = NULL;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CustomizeSyncWindowView, views::ButtonListener implementations
-
-void CustomizeSyncWindowView::ButtonPressed(views::Button* sender,
- const views::Event& event) {
- GetWindow()->GetClientView()->AsDialogClientView()->UpdateDialogButtons();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CustomizeSyncWindowView, private
-
-views::Checkbox* CustomizeSyncWindowView::AddCheckbox(const std::wstring& text,
- bool checked) {
- views::Checkbox* checkbox = new views::Checkbox(text);
- checkbox->SetChecked(checked);
- checkbox->set_listener(this);
- AddChildView(checkbox);
- return checkbox;
-}
-
-void CustomizeSyncWindowView::Init() {
- syncable::ModelTypeSet registered_types;
- profile_->GetProfileSyncService()->GetRegisteredDataTypes(&registered_types);
-
- syncable::ModelTypeSet preferred_types;
- profile_->GetProfileSyncService()->GetPreferredDataTypes(&preferred_types);
-
- description_label_ = new views::Label();
- description_label_->SetText(
- l10n_util::GetString(IDS_CUSTOMIZE_SYNC_DESCRIPTION));
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- const gfx::Font& title_font =
- rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);
- description_label_->SetFont(title_font);
- AddChildView(description_label_);
-
- // If the user hasn't set up sync yet, check the box (because all sync types
- // should be on by default). If the user has, then check the box for a
- // data type if that data type is already being synced.
- DCHECK(registered_types.count(syncable::BOOKMARKS));
- bool bookmarks_checked = preferred_types.count(syncable::BOOKMARKS) != 0;
- bookmarks_check_box_ = AddCheckbox(
- l10n_util::GetString(IDS_SYNC_DATATYPE_BOOKMARKS), bookmarks_checked);
-
- if (registered_types.count(syncable::PREFERENCES)) {
- bool prefs_checked = preferred_types.count(syncable::PREFERENCES) != 0;
- preferences_check_box_ = AddCheckbox(
- l10n_util::GetString(IDS_SYNC_DATATYPE_PREFERENCES), prefs_checked);
- }
-
- if (registered_types.count(syncable::THEMES)) {
- bool themes_checked = preferred_types.count(syncable::THEMES) != 0;
- themes_check_box_ = AddCheckbox(
- l10n_util::GetString(IDS_SYNC_DATATYPE_THEMES), themes_checked);
- }
-
- if (registered_types.count(syncable::EXTENSIONS)) {
- bool extensions_checked = preferred_types.count(syncable::EXTENSIONS) != 0;
- extensions_check_box_ = AddCheckbox(
- l10n_util::GetString(IDS_SYNC_DATATYPE_EXTENSIONS), extensions_checked);
- }
-
- if (registered_types.count(syncable::AUTOFILL)) {
- bool autofill_checked = preferred_types.count(syncable::AUTOFILL) != 0;
- autofill_check_box_ = AddCheckbox(
- l10n_util::GetString(IDS_SYNC_DATATYPE_AUTOFILL), autofill_checked);
- }
-}
diff --git a/chrome/browser/views/options/customize_sync_window_view.h b/chrome/browser/views/options/customize_sync_window_view.h
deleted file mode 100644
index 02faa3c..0000000
--- a/chrome/browser/views/options/customize_sync_window_view.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_CUSTOMIZE_SYNC_WINDOW_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_CUSTOMIZE_SYNC_WINDOW_VIEW_H_
-
-#include "views/controls/button/button.h"
-#include "views/view.h"
-#include "views/window/dialog_delegate.h"
-#include "views/window/window.h"
-
-namespace views {
-class Checkbox;
-class Label;
-}
-
-class Profile;
-
-class CustomizeSyncWindowView : public views::View,
- public views::DialogDelegate,
- public views::ButtonListener {
- public:
- virtual ~CustomizeSyncWindowView() {}
-
- // Show the CustomizeSyncWindowView for the given profile. |parent_window| is
- // optional.
- // TODO(dantasse) when we make this window modal, |parent_window| will not be
- // optional.
- static void Show(gfx::NativeWindow parent_window, Profile* profile);
-
- // Simulate clicking the "OK" and "Cancel" buttons on the singleton dialog,
- // if it exists.
- // ClickOk() returns whether it's possible to click OK (i.e. you can't click
- // OK if you have selected zero data types to sync.)
- static bool ClickOk();
- static void ClickCancel();
-
- // views::View methods:
- virtual void Layout();
- virtual gfx::Size GetPreferredSize();
- virtual void ViewHierarchyChanged(bool is_add, views::View* parent,
- views::View* child);
-
- // views::DialogDelegate methods:
- virtual bool Accept();
- virtual int GetDialogButtons() const;
- virtual bool IsDialogButtonEnabled(
- MessageBoxFlags::DialogButton button) const;
- virtual bool CanResize() const { return false; }
- virtual bool CanMaximize() const { return false; }
- virtual bool IsAlwaysOnTop() const { return false; }
- virtual bool HasAlwaysOnTopMenu() const { return false; }
- virtual std::wstring GetWindowTitle() const;
- // TODO(dantasse) make this gaia-dialog-modal by overriding IsModal() when
- // we replace the HTML sync setup wizard with more native dialogs.
- virtual void WindowClosing();
- virtual views::View* GetContentsView();
-
- // views::ButtonListener method:
- // Update the "OK" button whenever you click a checkbox, so that if you
- // uncheck all the checkboxes, the "OK" box is grayed out.
- virtual void ButtonPressed(views::Button* sender, const views::Event& event);
-
- private:
- explicit CustomizeSyncWindowView(Profile* profile);
-
- // Initialize the controls on the dialog.
- void Init();
-
- // Adds a new check-box as a child to the view.
- views::Checkbox* AddCheckbox(const std::wstring& text, bool checked);
-
- views::Label* description_label_;
- views::Checkbox* bookmarks_check_box_;
- views::Checkbox* preferences_check_box_;
- views::Checkbox* themes_check_box_;
- views::Checkbox* extensions_check_box_;
- views::Checkbox* autofill_check_box_;
-
- Profile* profile_;
-
- // Singleton instance of this class.
- static CustomizeSyncWindowView* instance_;
-
- DISALLOW_COPY_AND_ASSIGN(CustomizeSyncWindowView);
-};
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_CUSTOMIZE_SYNC_WINDOW_VIEW_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 76656af..495d6d6 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -877,9 +877,6 @@
'browser/cocoa/styled_text_field.mm',
'browser/cocoa/styled_text_field_cell.h',
'browser/cocoa/styled_text_field_cell.mm',
- 'browser/cocoa/sync_customize_controller.h',
- 'browser/cocoa/sync_customize_controller_cppsafe.h',
- 'browser/cocoa/sync_customize_controller.mm',
'browser/cocoa/tab_contents_controller.h',
'browser/cocoa/tab_contents_controller.mm',
'browser/cocoa/tab_controller.h',
@@ -1477,8 +1474,6 @@
'browser/gtk/options/cookie_filter_page_gtk.h',
'browser/gtk/options/cookies_view.cc',
'browser/gtk/options/cookies_view.h',
- 'browser/gtk/options/customize_sync_window_gtk.cc',
- 'browser/gtk/options/customize_sync_window_gtk.h',
'browser/gtk/options/fonts_languages_window_gtk.cc',
'browser/gtk/options/fonts_page_gtk.cc',
'browser/gtk/options/fonts_page_gtk.h',
@@ -2575,8 +2570,6 @@
'browser/views/options/cookie_filter_page_view.h',
'browser/views/options/cookies_view.cc',
'browser/views/options/cookies_view.h',
- 'browser/views/options/customize_sync_window_view.cc',
- 'browser/views/options/customize_sync_window_view.h',
'browser/views/options/exception_editor_view.cc',
'browser/views/options/exception_editor_view.h',
'browser/views/options/exceptions_view.cc',
@@ -2965,7 +2958,6 @@
'app/nibs/SadTab.xib',
'app/nibs/SaveAccessoryView.xib',
'app/nibs/SimpleContentExceptionsWindow.xib',
- 'app/nibs/SyncCustomize.xib',
'app/nibs/TaskManager.xib',
'app/nibs/Toolbar.xib',
],
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 21cb94a..cc7527a 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -239,7 +239,6 @@
'app/nibs/SaveAccessoryView.xib',
'app/nibs/SadTab.xib',
'app/nibs/SimpleContentExceptionsWindow.xib',
- 'app/nibs/SyncCustomize.xib',
'app/nibs/TabContents.xib',
'app/nibs/TabView.xib',
'app/nibs/TaskManager.xib',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index cd21ed3..2a1cf00 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -757,7 +757,6 @@
'browser/cocoa/styled_text_field_test_helper.h',
'browser/cocoa/styled_text_field_test_helper.mm',
'browser/cocoa/styled_text_field_unittest.mm',
- 'browser/cocoa/sync_customize_controller_unittest.mm',
'browser/cocoa/tab_controller_unittest.mm',
'browser/cocoa/tab_strip_controller_unittest.mm',
'browser/cocoa/tab_strip_view_unittest.mm',
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 1972fce..77f737c 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -98,7 +98,6 @@ extern const char kChromeUIThemePath[];
// Sync related URL components.
extern const char kSyncResourcesHost[];
extern const char kSyncGaiaLoginPath[];
-extern const char kSyncMergeAndSyncPath[];
extern const char kSyncChooseDataTypesPath[];
extern const char kSyncSetupDonePath[];
extern const char kSyncSetupFlowPath[];
generated by cgit v1.1 at 2025-02-02 19:46:53 +0000