app-shell: Remove ShellRendererMainDelegate.

ShellRendererMainDelegate is not used in athena or app-shell. So remove it.
Also, add interface methods in ShellMainDelegate for creating the
content-client or the renderer-client (like for browser-client) so that
athena can create its own version should it want to (e.g. to enable pdf
and/or other plugins, or override other features).

BUG=401242
R=jamescook@chromium.org, oshima@chromium.org

Review URL: https://codereview.chromium.org/464113004

Cr-Commit-Position: refs/heads/master@{#290908}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290908 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 41 deletions

diff --git a/extensions/shell/renderer/shell_content_renderer_client.cc b/extensions/shell/renderer/shell_content_renderer_client.cc
index b6f8ed7..b075961 100644
--- a/extensions/shell/renderer/shell_content_renderer_client.cc
+++ b/extensions/shell/renderer/shell_content_renderer_client.cc
@@ -14,7 +14,6 @@
 #include "extensions/shell/common/shell_extensions_client.h"
 #include "extensions/shell/renderer/shell_dispatcher_delegate.h"
 #include "extensions/shell/renderer/shell_extensions_renderer_client.h"
-#include "extensions/shell/renderer/shell_renderer_main_delegate.h"
 
 #if !defined(DISABLE_NACL)
 #include "components/nacl/common/nacl_constants.h"
@@ -68,9 +67,7 @@ void ShellFrameHelper::WillReleaseScriptContext(v8::Handle<v8::Context> context,
 
 }  // namespace
 
-ShellContentRendererClient::ShellContentRendererClient(
-    scoped_ptr<ShellRendererMainDelegate> delegate)
-    : delegate_(delegate.Pass()) {
+ShellContentRendererClient::ShellContentRendererClient() {
 }
 
 ShellContentRendererClient::~ShellContentRendererClient() {
@@ -94,8 +91,6 @@ void ShellContentRendererClient::RenderThreadStarted() {
 
   // TODO(jamescook): Init WebSecurityPolicy for chrome-extension: schemes.
   // See ChromeContentRendererClient for details.
-  if (delegate_)
-    delegate_->OnThreadStarted(thread);
 }
 
 void ShellContentRendererClient::RenderFrameCreated(
@@ -114,8 +109,6 @@ void ShellContentRendererClient::RenderFrameCreated(
 void ShellContentRendererClient::RenderViewCreated(
     content::RenderView* render_view) {
   new ExtensionHelper(render_view, extension_dispatcher_.get());
-  if (delegate_)
-    delegate_->OnViewCreated(render_view);
 }
 
 bool ShellContentRendererClient::OverrideCreatePlugin(
diff --git a/extensions/shell/renderer/shell_content_renderer_client.h b/extensions/shell/renderer/shell_content_renderer_client.h
index f40233c..94b7bb1 100644
--- a/extensions/shell/renderer/shell_content_renderer_client.h
+++ b/extensions/shell/renderer/shell_content_renderer_client.h
@@ -21,8 +21,7 @@ class ShellRendererMainDelegate;
 // Renderer initialization and runtime support for app_shell.
 class ShellContentRendererClient : public content::ContentRendererClient {
  public:
-  explicit ShellContentRendererClient(
-      scoped_ptr<ShellRendererMainDelegate> delegate);
+  ShellContentRendererClient();
   virtual ~ShellContentRendererClient();
 
   // content::ContentRendererClient implementation:
@@ -51,7 +50,6 @@ class ShellContentRendererClient : public content::ContentRendererClient {
   virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE;
 
  private:
-  scoped_ptr<ShellRendererMainDelegate> delegate_;
   scoped_ptr<ShellExtensionsClient> extensions_client_;
   scoped_ptr<ShellExtensionsRendererClient> extensions_renderer_client_;
   scoped_ptr<DispatcherDelegate> extension_dispatcher_delegate_;
diff --git a/extensions/shell/renderer/shell_renderer_main_delegate.h b/extensions/shell/renderer/shell_renderer_main_delegate.h
deleted file mode 100644
index 51396bd..0000000
--- a/extensions/shell/renderer/shell_renderer_main_delegate.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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.
-
-#ifndef EXTENSIONS_SHELL_RENDERER_SHELL_RENDERER_MAIN_DELEGATE_H_
-#define EXTENSIONS_SHELL_RENDERER_SHELL_RENDERER_MAIN_DELEGATE_H_
-
-namespace content {
-class RenderThread;
-class RenderView;
-}
-
-namespace extensions {
-
-class ShellRendererMainDelegate {
- public:
-  virtual ~ShellRendererMainDelegate() {}
-
-  // Called when |thread| is started, after the extensions subsystem has been
-  // initialized for |thread|.
-  virtual void OnThreadStarted(content::RenderThread* thread) = 0;
-
-  // Called for each RenderView created in the renderer process, after the
-  // extension related code has been initialized for the view.
-  virtual void OnViewCreated(content::RenderView* view) = 0;
-};
-
-}  // namespace extensions
-
-#endif  // EXTENSIONS_SHELL_RENDERER_SHELL_RENDERER_MAIN_DELEGATE_H_