Add Reapply() to declarative action interface. This is needed for RequestContentScript to work corr…

chrome/browser/extensions/api/declarative_content/content_action.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/declarative_content/content_action.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
@@ skipping 52 matching lines @@
   // Implementation of ContentAction:
   virtual Type GetType() const OVERRIDE { return ACTION_SHOW_PAGE_ACTION; }
   virtual void Apply(const std::string& extension_id,
                      const base::Time& extension_install_time,
                      ApplyInfo* apply_info) const OVERRIDE {
     ExtensionAction* action = GetPageAction(apply_info->profile, extension_id);
     action->DeclarativeShow(ExtensionTabUtil::GetTabId(apply_info->tab));
     ExtensionActionAPI::Get(apply_info->profile)->NotifyChange(
         action, apply_info->tab, apply_info->profile);
   }
+  // The page action is already showing, so nothing needs to be done here.
+  virtual void Reapply(const std::string& extension_id,
+                       const base::Time& extension_install_time,
+                       ApplyInfo* apply_info) const OVERRIDE {}
   virtual void Revert(const std::string& extension_id,
                       const base::Time& extension_install_time,
                       ApplyInfo* apply_info) const OVERRIDE {
     if (ExtensionAction* action =
             GetPageAction(apply_info->profile, extension_id)) {
       action->UndoDeclarativeShow(ExtensionTabUtil::GetTabId(apply_info->tab));
       ExtensionActionAPI::Get(apply_info->profile)->NotifyChange(
           action, apply_info->tab, apply_info->profile);
     }
   }
@@ skipping 35 matching lines @@
     return ACTION_REQUEST_CONTENT_SCRIPT;
   }
 
   virtual void Apply(const std::string& extension_id,
                      const base::Time& extension_install_time,
                      ApplyInfo* apply_info) const OVERRIDE {
     // TODO(markdittmer): Invoke UserScriptMaster declarative script loader:
     // load new user script.
   }
 
+  virtual void Reapply(const std::string& extension_id,
+                       const base::Time& extension_install_time,
+                       ApplyInfo* apply_info) const OVERRIDE {
+    // TODO(markdittmer): Invoke UserScriptMaster declarative script loader:
+    // load new user script.
+  }
+
   virtual void Revert(const std::string& extension_id,
                       const base::Time& extension_install_time,
                       ApplyInfo* apply_info) const OVERRIDE {
     // TODO(markdittmer): Invoke UserScriptMaster declarative script loader:
     // do not load user script if Apply() runs again on the same page.
   }
 
  private:
   virtual ~RequestContentScript() {}
 
@@ skipping 118 matching lines @@
       factory_method_iter = factory.factory_methods.find(instance_type);
   if (factory_method_iter != factory.factory_methods.end())
     return (*factory_method_iter->second)(
         extension, action_dict, error, bad_message);
 
   *error = base::StringPrintf(kInvalidInstanceTypeError, instance_type.c_str());
   return scoped_refptr<ContentAction>();
 }
 
 }  // namespace extensions