Client changes for disabled dasher account

chrome/browser/ui/sync/one_click_signin_sync_starter.cc

 // Copyright (c) 2012 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/ui/sync/one_click_signin_sync_starter.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 
@@ skipping 281 matching lines @@
     }
   }
   delete this;
 }
 
 void OneClickSigninSyncStarter::SigninSuccess() {
   ProfileSyncService* profile_sync_service = GetProfileSyncService();
   switch (start_mode_) {
     case SYNC_WITH_DEFAULT_SETTINGS:
       if (profile_sync_service) {
-        // Just kick off the sync machine, no need to configure it first.
-        profile_sync_service->OnUserChoseDatatypes(true,
-                                                   syncer::ModelTypeSet());
-        profile_sync_service->SetSyncSetupCompleted();
+        if (!profile_sync_service->IsManaged()) {

[Andrew T Wilson (Slow), 2013/05/24 15:13:10]

If you move IsManaged() into IsSyncAccessible(), then GetProfileSyncService()
will return NULL and you won't need these explicit calls.

[pavely, 2013/05/24 22:17:11]

I need pointer to PSS to call SetSetupInProgress(false). See my
comment in signin_tracker.cc

+          // Just kick off the sync machine, no need to configure it first.
+          profile_sync_service->OnUserChoseDatatypes(true,
+                                                     syncer::ModelTypeSet());
+          profile_sync_service->SetSyncSetupCompleted();
+        }
         profile_sync_service->SetSetupInProgress(false);
       }
       if (confirmation_required_ == CONFIRM_AFTER_SIGNIN) {
         string16 message;
-        if (!profile_sync_service) {
+        if (!profile_sync_service || profile_sync_service->IsManaged()) {
           // Sync is disabled by policy.
           message = l10n_util::GetStringUTF16(
               IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE);
         }
         DisplayFinalConfirmationBubble(message);
       }
       break;
     case CONFIGURE_SYNC_FIRST:
       ConfigureSync();
       break;
@@ skipping 32 matching lines @@
   // Give the user a chance to configure things. We don't clear the
   // ProfileSyncService::setup_in_progress flag because we don't want sync
   // to start up until after the configure UI is displayed (the configure UI
   // will clear the flag when the user is done setting up sync).
   ProfileSyncService* profile_sync_service = GetProfileSyncService();
   LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_);
   if (login_ui->current_login_ui()) {
     login_ui->current_login_ui()->FocusUI();
   } else {
     EnsureBrowser();
-    if (profile_sync_service) {
+    if (profile_sync_service && !profile_sync_service->IsManaged()) {
       // Need to navigate to the settings page and display the sync UI.
       if (force_same_tab_navigation_) {
         ShowSyncSettingsPageOnSameTab();
       } else {
         chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
       }
     } else {
       // Sync is disabled - just display the settings page.
       chrome::ShowSettings(browser_);
     }
   }
 }
 
 ProfileSyncService* OneClickSigninSyncStarter::GetProfileSyncService() {
   ProfileSyncService* service = NULL;
   if (profile_->IsSyncAccessible())
     service = ProfileSyncServiceFactory::GetForProfile(profile_);
   return service;
 }
 
 void OneClickSigninSyncStarter::ShowSyncSettingsPageOnSameTab() {
   std::string url = std::string(chrome::kChromeUISettingsURL) +
       chrome::kSyncSetupSubPage;
   chrome::NavigateParams params(
       browser_, GURL(url), content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   params.disposition = CURRENT_TAB;
   params.window_action = chrome::NavigateParams::SHOW_WINDOW;
   chrome::Navigate(&params);
 }