Bring up a content settings icon for ungestured registerProtocolHandler call.

chrome/browser/content_settings/tab_specific_content_settings.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_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #pragma once
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/geolocation/geolocation_settings_state.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
+#include "chrome/common/custom_handlers/protocol_handler.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 
 class CookiesTreeModel;
 class Profile;
 
 namespace content {
 class RenderViewHost;
 }
@@ skipping 132 matching lines @@
 
   const std::set<std::string>& BlockedResourcesForType(
       ContentSettingsType content_type) const;
 
   // Returns the GeolocationSettingsState that controls the
   // geolocation API usage on this page.
   const GeolocationSettingsState& geolocation_settings_state() const {
     return geolocation_settings_state_;
   }
 
+  void SetRegisterProtocolHandlerCalledUngestured(ProtocolHandler handler) {

[koz (OOO until 15th September), 2012/06/21 01:50:53]

This code could do with an explanatory comment.

Also, what do you think of the name SetPendingRegisterProtocolHandler()? It is
more suggestive about what happens with this protocol handler (ie: gets
registered later, when the user accepts).

[Greg Billock, 2012/06/21 19:59:11]

Done.

+    register_protocol_handler_called_ungestured_ = handler;
+  }
+
+  bool IsRegisterProtocolHandlerCalledUngestured() const {

[koz (OOO until 15th September), 2012/06/21 01:50:53]

IsRegisterProtocolHandlerPending()?

[Greg Billock, 2012/06/21 19:59:11]

Killed this in favor of just doing PendingProtocolHandler().IsEmpty().

+    return !register_protocol_handler_called_ungestured_.IsEmpty();
+  }
+
+  const ProtocolHandler& UngesturedProtocolHandler() const {

[koz (OOO until 15th September), 2012/06/21 01:50:53]

GetPendingProtocolHandler()

[Greg Billock, 2012/06/21 19:59:11]

Done.

+    return register_protocol_handler_called_ungestured_;
+  }
+
+  void SetOldRegisterProtocolHandlerTitle(const string16 title) {

[koz (OOO until 15th September), 2012/06/21 01:50:53]

SetProtocolHandlerTitleToBeReplaced()?

[Greg Billock, 2012/06/21 19:59:11]

Called this 'Previous'. Sound good?

[koz (OOO until 15th September), 2012/06/21 23:03:50]

Yep, sounds fine.

+    old_protocol_handler_title_ = title;
+  }
+
+  const string16& OldRegisterProtocolHandlerTitle() const {

[koz (OOO until 15th September), 2012/06/21 01:50:53]

GetProtocolHandlerTitleToBeReplaced()

[Greg Billock, 2012/06/21 19:59:11]

Done.

+    return old_protocol_handler_title_;
+  }
+
   // Returns a pointer to the |LocalSharedObjectsContainer| that contains all
   // allowed local shared objects like cookies, local storage, ... .
   const LocalSharedObjectsContainer& allowed_local_shared_objects() const {
     return allowed_local_shared_objects_;
   }
 
   // Returns a pointer to the |LocalSharedObjectsContainer| that contains all
   // blocked local shared objects like cookies, local storage, ... .
   const LocalSharedObjectsContainer& blocked_local_shared_objects() const {
     return blocked_local_shared_objects_;
@@ skipping 91 matching lines @@
   // The profile of the tab.
   Profile* profile_;
 
   // Stores the blocked/allowed cookies.
   LocalSharedObjectsContainer allowed_local_shared_objects_;
   LocalSharedObjectsContainer blocked_local_shared_objects_;
 
   // Manages information about Geolocation API usage in this page.
   GeolocationSettingsState geolocation_settings_state_;
 
+  // Set to the registered protocol descriptor if registerProtocolHandler was

[koz (OOO until 15th September), 2012/06/21 01:50:53]

Maybe rephrase as "The protocol handler that is pending user approval for
registration. This situation arises when a call to registerProtocolHandler() is
made without a user gesture. An empty protocol handler means that no protocol
handler is pending registration."

[Greg Billock, 2012/06/21 19:59:11]

I like it. Making all these changes.

+  // called on this tab without a user gesture. The |IsEmpty| method will
+  // be true if no registration was performed.
+  ProtocolHandler register_protocol_handler_called_ungestured_;

[koz (OOO until 15th September), 2012/06/21 01:50:53]

If the above name changes are followed, this could be called
pending_register_protocol_handler_ or similar.

[Greg Billock, 2012/06/21 19:59:11]

Done.

+
+  // If there is an old protocol handler, this is the title. (Used for the

[koz (OOO until 15th September), 2012/06/21 01:50:53]

Maybe rephrase this as "The title of the protocol handler that will be replaced
if the pending call to registerProtocolHandler goes through. Empty if no
protocol handler will be replaced."

[Greg Billock, 2012/06/21 19:59:11]

Done.

+  // message prompt.)
+  string16 old_protocol_handler_title_;

[koz (OOO until 15th September), 2012/06/21 01:50:53]

protocol_handler_to_be_replaced_title_?

Also, consider just storing the whole ProtocolHandler, rather than just the
title. Then you could omit Title from all the variable and method names above.

[Greg Billock, 2012/06/21 19:59:11]

At this point I don't think we need the whole thing -- just the title to build
the right message. Do we end up needing it for API calls later?

+
   // Stores whether the user can load blocked plugins on this page.
   bool load_plugins_link_enabled_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_