Rename ActionBoxController -> LocationBarController.

chrome/browser/extensions/script_badge_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_SCRIPT_BADGE_CONTROLLER_H_
 #define CHROME_BROWSER_EXTENSIONS_SCRIPT_BADGE_CONTROLLER_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/memory/linked_ptr.h"
-#include "chrome/browser/extensions/action_box_controller.h"
+#include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/extensions/script_executor_impl.h"
 #include "content/public/browser/web_contents_observer.h"
 
 class ExtensionAction;
 class ExtensionService;
 class TabContentsWrapper;
 
 namespace extensions {
 
 class Extension;
 
-// An ActionBoxController which corresponds to script badges, and implements
-// ScriptExecutor in order to show those scripts in the action box too.
-class ScriptBadgeController : public ActionBoxController,
+// An LocationBarController which displays icons whenever a script is executing
+// in a tab. It accomplishes this two different ways:
+//
+// - For content_script declarations, the current URL in the tab is compared to
+//   registered content scripts when GetCurrentActions() is called.
+// - An interface is exposed for programmatically executing scripts. Executed
+//   scripts are recorded and used later to populate GetCurrentActions().
+//
+// TODO(aa): There are some edge cases that need to be thought-through here:
+//
+// - Redirects. In this case, I think we may flicker the icons in the url bar
+//   as we bounce from URL to URL, without any script actually being executed.

[not at google - send to devlin, 2012/05/25 22:29:50]

Yeah, maybe we should be showing these on load, hopefully that's possible from
the browser.

+// - Frames. This won't show icons for content_scripts running in frames. Should
+//   it?

[not at google - send to devlin, 2012/05/25 22:29:50]

Won't it?  I thought it would?

My understanding is that for content_scripts the "matches" is for top-level
frames and if you specify all_frames it will apply to sub-frames.  And that for
executing scripts it's similar. I guess my understanding is wrong?

[Aaron Boodman, 2012/05/26 07:42:18]

Nope.
Yep.

+// - Possibly other weirdness where the state here doesn't match the state in
+//   the renderer for whatever reason.

[not at google - send to devlin, 2012/05/25 22:29:50]

Yes, I've been trying to keep all the state in one place to avoid this.  The
browser seemed like it would be adequate and less corner-casey... so yeah, been
avoiding putting any state in the renderer.

+class ScriptBadgeController : public LocationBarController,
                               public ScriptExecutor,
                               public content::WebContentsObserver {
  public:
   explicit ScriptBadgeController(TabContentsWrapper* tab_contents);
   virtual ~ScriptBadgeController();
 
-  // ActionBoxController implementation.
+  // LocationBarController implementation.
   virtual scoped_ptr<std::vector<ExtensionAction*> > GetCurrentActions()
       OVERRIDE;
   virtual Action OnClicked(const std::string& extension_id,
                            int mouse_button) OVERRIDE;
 
   // ScriptExecutor implementation.
   virtual void ExecuteScript(const std::string& extension_id,
                              ScriptType script_type,
                              const std::string& code,
                              FrameScope frame_scope,
@@ skipping 27 matching lines @@
   // that get generated for extensions that haven't declared anything.
   typedef std::map<std::string, linked_ptr<ExtensionAction> > ScriptBadgeMap;
   ScriptBadgeMap script_badges_;
 
   DISALLOW_COPY_AND_ASSIGN(ScriptBadgeController);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_SCRIPT_BADGE_CONTROLLER_H_