Stop showing page actions in the location bar with redesign enabled

chrome/browser/extensions/api/extension_action/extension_action_api.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/extensions/api/extension_action/extension_action_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/active_script_controller.h"
@@ skipping 153 matching lines @@
     const Extension* extension,
     Browser* browser,
     bool grant_active_tab_permissions) {
   content::WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents)
     return ExtensionAction::ACTION_NONE;
 
   int tab_id = SessionTabHelper::IdForTab(web_contents);
 
-  ExtensionAction* extension_action =
-      ExtensionActionManager::Get(browser_context_)->GetExtensionAction(
-          *extension);
-
-  // Anything that calls this should have a page or browser action.
-  DCHECK(extension_action);
-  if (!extension_action->GetIsVisible(tab_id))
-    return ExtensionAction::ACTION_NONE;
+  ActiveScriptController* active_script_controller =
+      ActiveScriptController::GetForWebContents(web_contents);
+  bool has_pending_scripts = false;
+  if (active_script_controller &&
+      active_script_controller->GetActionForExtension(extension)) {
+    has_pending_scripts = true;
+  }
 
   // Grant active tab if appropriate.
   if (grant_active_tab_permissions) {
     TabHelper::FromWebContents(web_contents)->active_tab_permission_granter()->
         GrantIfRequested(extension);
   }
 
-  // Notify ActiveScriptController that the action was clicked, if appropriate.
-  ActiveScriptController* active_script_controller =
-      ActiveScriptController::GetForWebContents(web_contents);
-  if (active_script_controller &&
-      active_script_controller->GetActionForExtension(extension)) {
-    active_script_controller->OnClicked(extension);
-  }
+  // If this was a request to run a script, it will have been run once active
+  // tab was granted. Return without executing the action, since we should only
+  // run pending scripts OR the extension action, not both.
+  if (has_pending_scripts)
+    return ExtensionAction::ACTION_NONE;
+
+  ExtensionAction* extension_action =
+      ExtensionActionManager::Get(browser_context_)->GetExtensionAction(
+          *extension);
+
+  // Anything that gets here should have a page or browser action.
+  DCHECK(extension_action);
+  if (!extension_action->GetIsVisible(tab_id))
+    return ExtensionAction::ACTION_NONE;
 
   if (extension_action->HasPopup(tab_id))
     return ExtensionAction::ACTION_SHOW_POPUP;
 
   ExtensionActionExecuted(*extension_action, web_contents);
   return ExtensionAction::ACTION_NONE;
 }
 
 bool ExtensionActionAPI::ShowExtensionActionPopup(
     const Extension* extension,
@@ skipping 430 matching lines @@
   if (host->extension_host_type() != VIEW_TYPE_EXTENSION_POPUP ||
       host->extension()->id() != extension_->id())
     return;
 
   SendResponse(true);
   response_sent_ = true;
   registrar_.RemoveAll();
 }
 
 }  // namespace extensions