Merge 62782 - Revert 62189 - [Mac] Update Clear Browsing dialog for proper fu...

chrome/browser/cocoa/clear_browsing_data_controller.h

 // 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_CLEAR_BROWSING_DATA_CONTROLLER_
 #define CHROME_BROWSER_COCOA_CLEAR_BROWSING_DATA_CONTROLLER_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_ptr.h"
 
 class BrowsingDataRemover;
 class ClearBrowsingObserver;
 class Profile;
-class ProfileSyncService;
 @class ThrobberView;
 
 // Name of notification that is called when data is cleared.
 extern NSString* const kClearBrowsingDataControllerDidDelete;
 // A key in the above notification's userInfo. Contains a NSNumber with the
 // logically-ored constants defined in BrowsingDataRemover for the removal.
 extern NSString* const kClearBrowsingDataControllerRemoveMask;
 
 // A window controller for managing the "Clear Browsing Data" feature. Modally
 // presents a dialog offering the user a set of choices of what browsing data
 // to delete and does so if the user chooses.
 
 @interface ClearBrowsingDataController : NSWindowController {
  @private
   Profile* profile_;  // Weak, owned by browser.
   // If non-null means there is a removal in progress. Member used mainly for
   // automated tests. The remove deletes itself when it's done, so this is a
   // weak reference.
   BrowsingDataRemover* remover_;
-  ProfileSyncService* sync_service_;
   scoped_ptr<ClearBrowsingObserver> observer_;
   BOOL isClearing_;  // YES while clearing data is ongoing.
   NSString* clearingStatus_;
 
   IBOutlet NSTabView* tabView_;
   IBOutlet NSView* otherDataTab_;
   IBOutlet NSArray* objectsToVerticallySize_;
 
   // Values for checkboxes, kept in sync with bindings. These values get
   // persisted into prefs if the user accepts the dialog.
@@ skipping 28 matching lines @@
 // Properties for bindings
 @property (nonatomic) BOOL clearBrowsingHistory;
 @property (nonatomic) BOOL clearDownloadHistory;
 @property (nonatomic) BOOL emptyCache;
 @property (nonatomic) BOOL deleteCookies;
 @property (nonatomic) BOOL clearSavedPasswords;
 @property (nonatomic) BOOL clearFormData;
 @property (nonatomic) NSInteger timePeriod;
 @property (nonatomic) BOOL isClearing;
 @property (nonatomic, copy) NSString* clearingStatus;
-@property (readonly, nonatomic) BOOL isSyncVisible;
 @property (readonly, nonatomic) BOOL isSyncEnabled;
 
 @property (readonly) NSFont* labelFont;
 
 @end
 
 
 @interface ClearBrowsingDataController (ExposedForUnitTests)
 // Create the controller with the given profile (which must not be NULL).
 - (id)initWithProfile:(Profile*)profile;
 @property (readonly) int removeMask;
 - (void)persistToPrefs;
 - (void)closeDialog;
 - (void)dataRemoverDidFinish;
 @end
 
 #endif  // CHROME_BROWSER_COCOA_CLEAR_BROWSING_DATA_CONTROLLER_