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

chrome/browser/extensions/api/declarative/declarative_rule.h

 // Copyright (c) 2013 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.
 //
 // DeclarativeRule<>, DeclarativeConditionSet<>, and DeclarativeActionSet<>
 // templates usable with multiple different declarativeFoo systems.  These are
 // templated on the Condition and Action types that define the behavior of a
 // particular declarative event.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_DECLARATIVE_RULE_H__
@@ skipping 145 matching lines @@
              const base::Time& extension_install_time,
              typename ActionT::ApplyInfo* apply_info) const;
 
   // Rules call this method when they have stateful conditions, and those
   // conditions stop being fulfilled.  Rules with event-based conditions (e.g. a
   // network request happened) will never Revert() an action.
   void Revert(const std::string& extension_id,
               const base::Time& extension_install_time,
               typename ActionT::ApplyInfo* apply_info) const;
 
+  // Rules call this method when their conditions are checked and were already
+  // fulfilled previously.
+  void Reapply(const std::string& extension_id,

[not at google - send to devlin, 2014/08/21 00:32:56]

nit: put this between Apply and Revert, since that's where it lies in the
lifecycle.

and perhaps:

Rules call this method when their conditions are fulfilled, but Apply has
already been called.

[Mark Dittmer, 2014/08/21 01:08:48]

Done.

+               const base::Time& extension_install_time,
+               typename ActionT::ApplyInfo* apply_info) const;
+
   // Returns the minimum priority of rules that may be evaluated after
   // this rule. Defaults to MIN_INT.
   int GetMinimumPriority() const;
 
   const Actions& actions() const { return actions_; }
 
  private:
   const Actions actions_;
 
   DISALLOW_COPY_AND_ASSIGN(DeclarativeActionSet);
@@ skipping 211 matching lines @@
 void DeclarativeActionSet<ActionT>::Revert(
     const std::string& extension_id,
     const base::Time& extension_install_time,
     typename ActionT::ApplyInfo* apply_info) const {
   for (typename Actions::const_iterator i = actions_.begin();
        i != actions_.end(); ++i)
     (*i)->Revert(extension_id, extension_install_time, apply_info);
 }
 
 template<typename ActionT>
+void DeclarativeActionSet<ActionT>::Reapply(

[not at google - send to devlin, 2014/08/21 00:32:56]

Ditto order.

[Mark Dittmer, 2014/08/21 01:08:48]

Done.

+    const std::string& extension_id,
+    const base::Time& extension_install_time,
+    typename ActionT::ApplyInfo* apply_info) const {
+  for (typename Actions::const_iterator i = actions_.begin();
+       i != actions_.end(); ++i)
+    (*i)->Reapply(extension_id, extension_install_time, apply_info);
+}
+
+template<typename ActionT>
 int DeclarativeActionSet<ActionT>::GetMinimumPriority() const {
   int minimum_priority = std::numeric_limits<int>::min();
   for (typename Actions::const_iterator i = actions_.begin();
        i != actions_.end(); ++i) {
     minimum_priority = std::max(minimum_priority, (*i)->minimum_priority());
   }
   return minimum_priority;
 }
 
 //
@@ skipping 75 matching lines @@
 }
 
 template<typename ConditionT, typename ActionT>
 int DeclarativeRule<ConditionT, ActionT>::GetMinimumPriority() const {
   return actions_->GetMinimumPriority();
 }
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_DECLARATIVE_RULE_H__