A little cleanup in the ash content example.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10506003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140143 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 35 deletions

diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc
index 56d0b7f..445a8e8 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -16,7 +16,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
-#include "content/shell/shell_devtools_delegate.h"
 #include "content/shell/shell_switches.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_module.h"
@@ -24,7 +23,6 @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/base/clipboard/clipboard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor.h"
@@ -64,8 +62,7 @@ class ShellViewsDelegate : public views::TestViewsDelegate {
 
 ShellBrowserMainParts::ShellBrowserMainParts(
     const content::MainFunctionParams& parameters)
-    : BrowserMainParts(),
-      devtools_delegate_(NULL) {
+    : BrowserMainParts() {
 }
 
 ShellBrowserMainParts::~ShellBrowserMainParts() {
@@ -79,10 +76,6 @@ void ShellBrowserMainParts::PreMainMessageLoopStart() {
 }
 #endif
 
-int ShellBrowserMainParts::PreCreateThreads() {
-  return 0;
-}
-
 void ShellBrowserMainParts::PreMainMessageLoopRun() {
   browser_context_.reset(new content::ShellBrowserContext);
 
@@ -103,8 +96,6 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
 }
 
 void ShellBrowserMainParts::PostMainMessageLoopRun() {
-  if (devtools_delegate_)
-    devtools_delegate_->Stop();
   browser_context_.reset();
 
   window_watcher_.reset();
@@ -117,11 +108,5 @@ bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
   return true;
 }
 
-ui::Clipboard* ShellBrowserMainParts::GetClipboard() {
-  if (!clipboard_.get())
-    clipboard_.reset(new ui::Clipboard());
-  return clipboard_.get();
-}
-
 }  // namespace shell
 }  // namespace ash
diff --git a/ash/shell/content_client/shell_browser_main_parts.h b/ash/shell/content_client/shell_browser_main_parts.h
index 9599fd3..26def45 100644
--- a/ash/shell/content_client/shell_browser_main_parts.h
+++ b/ash/shell/content_client/shell_browser_main_parts.h
@@ -14,13 +14,8 @@ namespace base {
 class Thread;
 }
 
-namespace ui {
-class Clipboard;
-}
-
 namespace content {
 class ShellBrowserContext;
-class ShellDevToolsDelegate;
 struct MainFunctionParams;
 }
 
@@ -36,21 +31,10 @@ class ShellBrowserMainParts : public content::BrowserMainParts {
   virtual ~ShellBrowserMainParts();
 
   // Overridden from content::BrowserMainParts:
-  virtual void PreEarlyInitialization() OVERRIDE {}
-  virtual void PostEarlyInitialization() OVERRIDE {}
   virtual void PreMainMessageLoopStart() OVERRIDE;
-  virtual void PostMainMessageLoopStart() OVERRIDE {}
-  virtual void ToolkitInitialized() OVERRIDE {}
-  virtual int PreCreateThreads() OVERRIDE;
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
   virtual void PostMainMessageLoopRun() OVERRIDE;
-  virtual void PostDestroyThreads() OVERRIDE {}
-
-  ui::Clipboard* GetClipboard();
-  content::ShellDevToolsDelegate* devtools_delegate() {
-    return devtools_delegate_;
-  }
 
   content::ShellBrowserContext* browser_context() {
     return browser_context_.get();
@@ -58,9 +42,6 @@ class ShellBrowserMainParts : public content::BrowserMainParts {
 
  private:
   scoped_ptr<content::ShellBrowserContext> browser_context_;
-
-  scoped_ptr<ui::Clipboard> clipboard_;
-  content::ShellDevToolsDelegate* devtools_delegate_;
   scoped_ptr<ash::shell::WindowWatcher> window_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);