Allow the content setting or resource type to be passed into the Website Settings page by a hash.

chrome/browser/resources/options/website_settings.js

 // Copyright 2014 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.
 
 cr.define('options', function() {
   /** @const */ var Page = cr.ui.pageManager.Page;
   /** @const */ var PageManager = cr.ui.pageManager.PageManager;
   /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /////////////////////////////////////////////////////////////////////////////
@@ skipping 24 matching lines @@
     /** @override */
     initializePage: function() {
       Page.prototype.initializePage.call(this);
 
       $('website-settings-overlay-confirm').onclick =
           PageManager.closeOverlay.bind(PageManager);
 
       $('resourceType').onchange = function() {
         var target = event.target;
         assert(target.tagName == 'SELECT');
-        if (target.value == 'storage')
-          chrome.send('updateLocalStorage');
-        else if (target.value == 'battery')
-          chrome.send('updateBatteryUsage');
-        else
-          chrome.send('updateOrigins', [target.value]);
+        WebsiteSettingsManager.getInstance().updatePage_(target.value);
       };
 
       var searchBox = $('website-settings-search-box');
       searchBox.addEventListener('search',
                                  this.handleSearchQueryChange_.bind(this));
 
       searchBox.onkeydown = function(e) {
         if (e.keyIdentifier == 'Enter')
           e.preventDefault();
       };
 
       this.createOriginsList_();
-      chrome.send('updateOrigins', ['geolocation']);
     },
 
     /**
+     * Called after the page has been shown. Show the content settings or
+     * resource auditing for the location's hash.
+     */
+    didShowPage: function() {
+      var hash = location.hash;
+      if (hash)
+        hash = hash.slice(1);
+      else
+        hash = 'geolocation';
+      this.updatePage_(hash);
+
+      var selectResource = $('resourceType');
+      for (var i = 0; i < selectResource.options.length; i++) {

[Bernhard Bauer, 2014/09/09 09:05:22]

I think there's an easier way to do this... can you assign selectResource.value
directly?

[Daniel Nishi, 2014/09/09 15:14:55]

Huh. I thought I tested that and it didn't work, but it works.

Done.

+        var value = selectResource.options[i].value;
+        if (value == hash)
+          selectResource.selectedIndex = i;
+      }
+    },
+
+    /**
      * Creates, decorates and initializes the origin list.
      * @private
      */
     createOriginsList_: function() {
       this.originList_ = this.pageDiv.querySelector('.origin-list');
       options.OriginList.decorate(this.originList_);
       this.originList_.autoExpands = true;
     },
 
     /**
@@ skipping 36 matching lines @@
      * @param {!Event} e The event object.
      * @private
      */
     handleSearchQueryChange_: function(e) {
       if (this.queryDelayTimerId_)
         window.clearTimeout(this.queryDelayTimerId_);
 
       this.queryDelayTimerId_ = window.setTimeout(this.searchOrigins.bind(this),
                                                   160);
     },
+
+    /**
+     * Updates the page with the given content setting or resource name's
+     * information.
+     * @param {string} typeName The name of the content setting or resource.
+     */
+    updatePage_: function(typeName) {
+      if (typeName == 'storage')
+        chrome.send('updateLocalStorage');
+      else if (typeName == 'battery')
+        chrome.send('updateBatteryUsage');
+      else
+        chrome.send('updateOrigins', [typeName]);
+    }
   };
 
   WebsiteSettingsManager.populateOrigins = function(originDict) {
     WebsiteSettingsManager.getInstance().populateOrigins_(originDict);
   };
 
   WebsiteSettingsManager.showEditPage = function(url) {
     WebsiteSettingsEditor.getInstance().populatePage(url);
   };
 
   // Export
   return {
     WebsiteSettingsManager: WebsiteSettingsManager
   };
 });