Get rid of ContentBrowserClient::GetClipboard as part of simplifying the work that each embedder has to do.

Also remove some code in the views WebView example that isn't needed.

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

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

4 files changed, 0 insertions, 19 deletions

diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc
index c7d0b4b..d2b020b 100644
--- a/content/shell/shell_browser_main_parts.cc
+++ b/content/shell/shell_browser_main_parts.cc
@@ -17,7 +17,6 @@
 #include "content/shell/shell_switches.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_module.h"
-#include "ui/base/clipboard/clipboard.h"
 
 #if defined(OS_ANDROID)
 #include "base/message_pump_android.h"
@@ -107,10 +106,4 @@ bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
   return false;
 }
 
-ui::Clipboard* ShellBrowserMainParts::GetClipboard() {
-  if (!clipboard_.get())
-    clipboard_.reset(new ui::Clipboard());
-  return clipboard_.get();
-}
-
 }  // namespace
diff --git a/content/shell/shell_browser_main_parts.h b/content/shell/shell_browser_main_parts.h
index 4bf9e97..24cae7c 100644
--- a/content/shell/shell_browser_main_parts.h
+++ b/content/shell/shell_browser_main_parts.h
@@ -14,10 +14,6 @@ namespace base {
 class Thread;
 }
 
-namespace ui {
-class Clipboard;
-}
-
 namespace content {
 
 class ShellBrowserContext;
@@ -41,7 +37,6 @@ class ShellBrowserMainParts : public BrowserMainParts {
   virtual void PostMainMessageLoopRun() OVERRIDE;
   virtual void PostDestroyThreads() OVERRIDE {}
 
-  ui::Clipboard* GetClipboard();
   ShellDevToolsDelegate* devtools_delegate() { return devtools_delegate_; }
 
   ShellBrowserContext* browser_context() { return browser_context_.get(); }
@@ -49,7 +44,6 @@ class ShellBrowserMainParts : public BrowserMainParts {
  private:
   scoped_ptr<ShellBrowserContext> browser_context_;
 
-  scoped_ptr<ui::Clipboard> clipboard_;
   ShellDevToolsDelegate* devtools_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc
index ae2e3ea..530fa4a 100644
--- a/content/shell/shell_content_browser_client.cc
+++ b/content/shell/shell_content_browser_client.cc
@@ -49,11 +49,6 @@ void ShellContentBrowserClient::ResourceDispatcherHostCreated() {
       resource_dispatcher_host_delegate_.get());
 }
 
-ui::Clipboard* ShellContentBrowserClient::GetClipboard() {
-  return shell_browser_main_parts_->GetClipboard();
-}
-
-
 std::string ShellContentBrowserClient::GetDefaultDownloadName() {
   return "download";
 }
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 0025f0d..01ef569 100644
--- a/content/shell/shell_content_browser_client.h
+++ b/content/shell/shell_content_browser_client.h
@@ -31,7 +31,6 @@ class ShellContentBrowserClient : public ContentBrowserClient {
   virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,
                                               int child_process_id) OVERRIDE;
   virtual void ResourceDispatcherHostCreated() OVERRIDE;
-  virtual ui::Clipboard* GetClipboard() OVERRIDE;
   virtual std::string GetDefaultDownloadName() OVERRIDE;
 
   ShellBrowserContext* browser_context();