Revert of [Extensions Toolbar] Add a finch config for the redesign

chrome/browser/extensions/location_bar_controller.cc

 // Copyright 2014 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/extensions/location_bar_controller.h"
 
 #include <algorithm>
 
 #include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
@@ skipping 12 matching lines @@
 namespace extensions {
 
 LocationBarController::LocationBarController(
     content::WebContents* web_contents)
     : web_contents_(web_contents),
       browser_context_(web_contents->GetBrowserContext()),
       action_manager_(ExtensionActionManager::Get(browser_context_)),
       should_show_page_actions_(
           !FeatureSwitch::extension_action_redesign()->IsEnabled()),
       extension_registry_observer_(this) {
-  extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
+  if (should_show_page_actions_)
+    extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
 }
 
 LocationBarController::~LocationBarController() {
 }
 
 std::vector<ExtensionAction*> LocationBarController::GetCurrentActions() {
   const ExtensionSet& extensions =
       ExtensionRegistry::Get(browser_context_)->enabled_extensions();
   std::vector<ExtensionAction*> current_actions;
   if (!should_show_page_actions_)
@@ skipping 41 matching lines @@
             ->permissions_data()
             ->HasAPIPermission(
                 extensions::APIPermission::kBookmarkManagerPrivate);
       });
   return current_actions;
 }
 
 void LocationBarController::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const Extension* extension) {
-  if (should_show_page_actions_ && action_manager_->GetPageAction(*extension)) {
+  if (action_manager_->GetPageAction(*extension)) {
     ExtensionActionAPI::Get(browser_context)->
         NotifyPageActionsChanged(web_contents_);
   }
 
   // We might also need to update the location bar if the extension can remove
   // the bookmark star.
   if (UIOverrides::RemovesBookmarkButton(extension)) {
     Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
     // In a perfect world, this can never be NULL. Unfortunately, since a
     // LocationBarController is attached to most WebContents, we can't make that
     // guarantee.
     if (!browser)
       return;
     // window() can be NULL if this is called before CreateBrowserWindow()
     // completes, and there won't be a location bar if the window has no toolbar
     // (e.g., and app window).
     LocationBar* location_bar =
         browser->window() ? browser->window()->GetLocationBar() : NULL;
     if (!location_bar)
       return;
     location_bar->UpdateBookmarkStarVisibility();
   }
 }
 
 void LocationBarController::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
-  if (should_show_page_actions_ && action_manager_->GetPageAction(*extension)) {
+  if (action_manager_->GetPageAction(*extension)) {
     ExtensionActionAPI::Get(browser_context)->
         NotifyPageActionsChanged(web_contents_);
   }
 }
 
 }  // namespace extensions