Reland "Encapsulate CSS selector declarative content condition tracking"

chrome/browser/extensions/tab_helper.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_TAB_HELPER_H_
 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
 
 #include <set>
 #include <string>
-#include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/extension_reenabler.h"
 #include "chrome/common/extensions/webstore_install_result.h"
 #include "chrome/common/web_application_info.h"
 #include "content/public/browser/notification_observer.h"
@@ skipping 39 matching lines @@
   bool CanCreateBookmarkApp() const;
 
   void UpdateShortcutOnLoadComplete() {
     update_shortcut_on_load_complete_ = true;
   }
 
   // ScriptExecutionObserver::Delegate
   virtual void AddScriptExecutionObserver(ScriptExecutionObserver* observer);
   virtual void RemoveScriptExecutionObserver(ScriptExecutionObserver* observer);
 
   // App extensions ------------------------------------------------------------

[not at google - send to devlin, 2015/06/09 20:38:11]

and in fact so does this.

[Mike Wittman, 2015/06/09 22:05:56]

Done.

 
   // Sets the extension denoting this as an app. If |extension| is non-null this
   // tab becomes an app-tab. WebContents does not listen for unload events for
   // the extension. It's up to consumers of WebContents to do that.
   //
   // NOTE: this should only be manipulated before the tab is added to a browser.
   // TODO(sky): resolve if this is the right way to identify an app tab. If it
   // is, than this should be passed in the constructor.
   void SetExtensionApp(const Extension* extension);
 
@@ skipping 37 matching lines @@
   // Sets a non-extension app icon associated with WebContents and fires an
   // INVALIDATE_TYPE_TITLE navigation state change to trigger repaint of title.
   void SetAppIcon(const SkBitmap& app_icon);
 
   // Sets the factory used to create inline webstore item installers.
   // Used for testing. Takes ownership of the factory instance.
   void SetWebstoreInlineInstallerFactoryForTests(
       WebstoreInlineInstallerFactory* factory);
 
  private:
+  // Utility function to invoke member functions on all relevant
+  // ContentRulesRegistries.
+  template <class Func>
+  void InvokeForContentRulesRegistries(const Func& func);
+
   // Different types of action when web app info is available.
   // OnDidGetApplicationInfo uses this to dispatch calls.
   enum WebAppAction {
     NONE,               // No action at all.
     CREATE_SHORTCUT,    // Bring up create application shortcut dialog.
     CREATE_HOSTED_APP,  // Create and install a hosted app.
     UPDATE_SHORTCUT     // Update icon for app shortcut.
   };
 
   explicit TabHelper(content::WebContents* web_contents);
@@ skipping 26 matching lines @@
                                const std::string& webstore_item_id,
                                const GURL& requestor_url,
                                int listeners_mask);
   void OnGetAppInstallState(const GURL& requestor_url,
                             int return_route_id,
                             int callback_id);
   void OnRequest(const ExtensionHostMsg_Request_Params& params);
   void OnContentScriptsExecuting(
       const ScriptExecutionObserver::ExecutingScriptsMap& extension_ids,
       const GURL& on_url);
-  void OnWatchedPageChange(const std::vector<std::string>& css_selectors);
   void OnDetailedConsoleMessageAdded(const base::string16& message,
                                      const base::string16& source,
                                      const StackTrace& stack_trace,
                                      int32 severity_level);
 
   // App extensions related methods:
 
   // Resets app_icon_ and if |extension| is non-null uses ImageLoader to load
   // the extension's image asynchronously.
   void UpdateExtensionAppIcon(const Extension* extension);
@@ skipping 20 matching lines @@
                const content::NotificationDetails& details) override;
 
   // Requests application info for the specified page. This is an asynchronous
   // request. The delegate is notified by way of OnDidGetApplicationInfo when
   // the data is available.
   void GetApplicationInfo(WebAppAction action);
 
   // Sends our tab ID to |render_view_host|.
   void SetTabId(content::RenderViewHost* render_view_host);
 
   // Data for app extensions ---------------------------------------------------

[not at google - send to devlin, 2015/06/09 20:38:11]

This comment seems entirely out of place. Can you delete it, cos, why not?

[Mike Wittman, 2015/06/09 22:05:56]

Yes, I found this odd also. Removed.

 
+  Profile* profile_;
+
   // Our content script observers. Declare at top so that it will outlive all
   // other members, since they might add themselves as observers.
   base::ObserverList<ScriptExecutionObserver> script_execution_observers_;
 
   // If non-null this tab is an app tab and this is the extension the tab was
   // created for.
   const Extension* extension_app_;
 
   // Icon for extension_app_ (if non-null) or a manually-set icon for
   // non-extension apps.
@@ skipping 21 matching lines @@
   scoped_ptr<ScriptExecutor> script_executor_;
 
   scoped_ptr<LocationBarController> location_bar_controller_;
 
   scoped_ptr<ActiveScriptController> active_script_controller_;
 
   scoped_ptr<ActiveTabPermissionGranter> active_tab_permission_granter_;
 
   scoped_ptr<BookmarkAppHelper> bookmark_app_helper_;
 
-  Profile* profile_;
-
   // Creates WebstoreInlineInstaller instances for inline install triggers.
   scoped_ptr<WebstoreInlineInstallerFactory> webstore_inline_installer_factory_;
 
   // The reenable prompt for disabled extensions, if any.
   scoped_ptr<ExtensionReenabler> extension_reenabler_;
 
   // Vend weak pointers that can be invalidated to stop in-progress loads.
   base::WeakPtrFactory<TabHelper> image_loader_ptr_factory_;
 
   // Generic weak ptr factory for posting callbacks.
   base::WeakPtrFactory<TabHelper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabHelper);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_