Remove some dead code in ChromeRenderViewObserver related to a method…

… on WebPermissionClient that doesn't exist anymore. BUG=304341 R=nasko@chromium.org Review URL: https://codereview.chromium.org/113063006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240215 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Dec 11, 2013 · c69c868 · c69c868
1 parent bf68767
commit c69c868
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 20 deletions.
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
@@ -1503,9 +1503,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
 #endif
     }
 
-    if (message_center::IsRichNotificationEnabled())
-      command_line->AppendSwitch(switches::kDisableHTMLNotifications);
-
     // Please keep this in alphabetical order.
     static const char* const kSwitchNames[] = {
       autofill::switches::kDisableInteractiveAutocomplete,

diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc
@@ -589,17 +589,6 @@ bool ChromeRenderViewObserver::allowWebComponents(const WebDocument& document,
   return false;
 }
 
-bool ChromeRenderViewObserver::allowHTMLNotifications(
-    const WebDocument& document) {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kDisableHTMLNotifications))
-    return false;
-
-  WebSecurityOrigin origin = document.securityOrigin();
-  const extensions::Extension* extension = GetExtension(origin);
-  return extension && extension->HasAPIPermission(APIPermission::kNotification);
-}
-
 bool ChromeRenderViewObserver::allowMutationEvents(const WebDocument& document,
                                                    bool default_value) {
   WebSecurityOrigin origin = document.securityOrigin();

diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h
@@ -103,8 +103,6 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
   virtual bool allowWriteToClipboard(blink::WebFrame* frame,
                                      bool default_value);
   virtual bool allowWebComponents(const blink::WebDocument&, bool);
-  virtual bool allowHTMLNotifications(
-      const blink::WebDocument& document);
   virtual bool allowMutationEvents(const blink::WebDocument&,
                                    bool default_value);
   virtual bool allowPushState(const blink::WebDocument&);

diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
@@ -236,9 +236,6 @@ const char kDisableHangMonitor[]            = "disable-hang-monitor";
 // Disable the RenderThread's HistogramCustomizer.
 const char kDisableHistogramCustomizer[]    = "disable-histogram-customizer";
 
-// Disables HTML-based desktop notifications.
-const char kDisableHTMLNotifications[]      = "disable-html-notifications";
-
 // Disable the use of an ImageTransportSurface. This means the GPU process
 // will present the rendered page rather than the browser process.
 const char kDisableImageTransportSurface[]  = "disable-image-transport-surface";

diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
@@ -78,7 +78,6 @@ CONTENT_EXPORT extern const char kDisableGpuSandbox[];
 CONTENT_EXPORT extern const char kDisableGpuWatchdog[];
 CONTENT_EXPORT extern const char kDisableHangMonitor[];
 extern const char kDisableHistogramCustomizer[];
-CONTENT_EXPORT extern const char kDisableHTMLNotifications[];
 extern const char kDisableImageTransportSurface[];
 CONTENT_EXPORT extern const char kDisableJava[];
 CONTENT_EXPORT extern const char kDisableJavaScript[];