Removing pre-material design menu setting.

chrome/browser/sync/sync_global_error.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/sync/sync_global_error.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"

[sky, 2017/02/23 20:44:52]

Remove include?

[jlebel, 2017/03/06 13:09:29]

Done.

 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "ui/base/l10n/l10n_util.h"
 
 SyncGlobalError::SyncGlobalError(
-    GlobalErrorService* global_error_service,
     LoginUIService* login_ui_service,
     syncer::SyncErrorController* error_controller,
     browser_sync::ProfileSyncService* profile_sync_service)
-    : global_error_service_(global_error_service),
-      login_ui_service_(login_ui_service),
+    : login_ui_service_(login_ui_service),
       error_controller_(error_controller),
       sync_service_(profile_sync_service) {
   DCHECK(sync_service_);
   error_controller_->AddObserver(this);
-  if (!switches::IsMaterialDesignUserMenu())
-    global_error_service_->AddUnownedGlobalError(this);

[sky, 2017/02/23 20:44:52]

Who owns this class now?

[jlebel, 2017/03/06 13:09:29]

Are you talking about SyncGlobalError?

SyncGlobalError is a PKS, so it basically destroyed when the profile is
destroyed.

[sky, 2017/03/06 18:50:40]

Acknowledged.

 }
 
 SyncGlobalError::~SyncGlobalError() {
   DCHECK(!error_controller_)
       << "SyncGlobalError::Shutdown() was not called";
 }
 
 void SyncGlobalError::Shutdown() {
-  if (!switches::IsMaterialDesignUserMenu())
-    global_error_service_->RemoveUnownedGlobalError(this);
   error_controller_->RemoveObserver(this);
   error_controller_ = nullptr;
 }
 
 bool SyncGlobalError::HasMenuItem() {
   return !menu_label_.empty();
 }
 
 int SyncGlobalError::MenuItemCommandID() {
   return IDC_SHOW_SYNC_ERROR;
@@ skipping 37 matching lines @@
 
 void SyncGlobalError::BubbleViewAcceptButtonPressed(Browser* browser) {
   ExecuteMenuItem(browser);
 }
 
 void SyncGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
   NOTREACHED();
 }
 
 void SyncGlobalError::OnErrorChanged() {
-  if (switches::IsMaterialDesignUserMenu())
-    return;
-
-  base::string16 menu_label;
-  base::string16 bubble_message;
-  base::string16 bubble_accept_label;
-  sync_ui_util::GetStatusLabelsForSyncGlobalError(
-      sync_service_, &menu_label, &bubble_message, &bubble_accept_label);
-
-  // All the labels should be empty or all of them non-empty.
-  DCHECK((menu_label.empty() && bubble_message.empty() &&
-          bubble_accept_label.empty()) ||
-         (!menu_label.empty() && !bubble_message.empty() &&
-          !bubble_accept_label.empty()));
-
-  if (menu_label != menu_label_ || bubble_message != bubble_message_ ||
-      bubble_accept_label != bubble_accept_label_) {
-    menu_label_ = menu_label;
-    bubble_message_ = bubble_message;
-    bubble_accept_label_ = bubble_accept_label;
-
-    global_error_service_->NotifyErrorsChanged(this);
-  }
 }