Move clipboard from app/ to ui/base

BUG=none
TEST=none
TBR=brettw

Review URL: http://codereview.chromium.org/6135006

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

4 files changed, 30 insertions, 26 deletions

diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index 7529236..245b861 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -4,12 +4,12 @@
 
 #include "views/controls/message_box_view.h"
 
-#include "app/clipboard/clipboard.h"
-#include "app/clipboard/scoped_clipboard_writer.h"
 #include "app/message_box_flags.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
+#include "ui/base/clipboard/clipboard.h"
+#include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "views/controls/button/checkbox.h"
 #include "views/standard_layout.h"
 #include "views/views_delegate.h"
@@ -101,11 +101,12 @@ bool MessageBoxView::AcceleratorPressed(
   if (!views::ViewsDelegate::views_delegate)
     return false;
 
-  Clipboard* clipboard = views::ViewsDelegate::views_delegate->GetClipboard();
+  ui::Clipboard* clipboard =
+      views::ViewsDelegate::views_delegate->GetClipboard();
   if (!clipboard)
     return false;
 
-  ScopedClipboardWriter scw(clipboard);
+  ui::ScopedClipboardWriter scw(clipboard);
   scw.WriteText(WideToUTF16Hack(message_label_->GetText()));
   return true;
 }
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index d74ff2c..404459d 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -6,8 +6,6 @@
 
 #include <algorithm>
 
-#include "app/clipboard/clipboard.h"
-#include "app/clipboard/scoped_clipboard_writer.h"
 #include "app/keyboard_codes.h"
 #include "app/keyboard_code_conversion_win.h"
 #include "app/l10n_util.h"
@@ -20,6 +18,8 @@
 #include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
+#include "ui/base/clipboard/clipboard.h"
+#include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_win.h"
 #include "views/controls/menu/menu_2.h"
@@ -464,7 +464,8 @@ void NativeTextfieldWin::OnCopy() {
   const std::wstring text(GetSelectedText());
 
   if (!text.empty() && ViewsDelegate::views_delegate) {
-    ScopedClipboardWriter scw(ViewsDelegate::views_delegate->GetClipboard());
+    ui::ScopedClipboardWriter scw(
+        ViewsDelegate::views_delegate->GetClipboard());
     scw.WriteText(text);
   }
 }
@@ -845,13 +846,13 @@ void NativeTextfieldWin::OnPaste() {
   if (textfield_->read_only() || !ViewsDelegate::views_delegate)
     return;
 
-  Clipboard* clipboard = ViewsDelegate::views_delegate->GetClipboard();
-  if (!clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType(),
-                                    Clipboard::BUFFER_STANDARD))
+  ui::Clipboard* clipboard = ViewsDelegate::views_delegate->GetClipboard();
+  if (!clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
+                                    ui::Clipboard::BUFFER_STANDARD))
     return;
 
   std::wstring clipboard_str;
-  clipboard->ReadText(Clipboard::BUFFER_STANDARD, &clipboard_str);
+  clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &clipboard_str);
   if (!clipboard_str.empty()) {
     std::wstring collapsed(CollapseWhitespace(clipboard_str, false));
     if (textfield_->style() & Textfield::STYLE_LOWERCASE)
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index fe5effe..721bab7 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -4,7 +4,6 @@
 
 #include <map>
 
-#include "app/clipboard/clipboard.h"
 #include "app/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ -12,6 +11,7 @@
 #include "gfx/canvas_skia.h"
 #include "gfx/path.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/clipboard/clipboard.h"
 #include "views/background.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/native/native_view_host.h"
@@ -783,7 +783,7 @@ TEST_F(ViewTest, Textfield) {
   const string16 kExtraText = ASCIIToUTF16("Pretty deep, Philip!");
   const string16 kEmptyString;
 
-  Clipboard clipboard;
+  ui::Clipboard clipboard;
 
   Widget* window = CreateWidget();
   window->Init(NULL, gfx::Rect(0, 0, 100, 100));
@@ -816,10 +816,10 @@ class TestViewsDelegate : public views::ViewsDelegate {
   virtual ~TestViewsDelegate() {}
 
   // Overridden from views::ViewsDelegate:
-  virtual Clipboard* GetClipboard() const {
+  virtual ui::Clipboard* GetClipboard() const {
     if (!clipboard_.get()) {
       // Note that we need a MessageLoop for the next call to work.
-      clipboard_.reset(new Clipboard);
+      clipboard_.reset(new ui::Clipboard);
     }
     return clipboard_.get();
   }
@@ -844,7 +844,7 @@ class TestViewsDelegate : public views::ViewsDelegate {
   virtual void ReleaseRef() {}
 
  private:
-  mutable scoped_ptr<Clipboard> clipboard_;
+  mutable scoped_ptr<ui::Clipboard> clipboard_;
 
   DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
 };
@@ -857,7 +857,7 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) {
   const std::wstring kReadOnlyText = L"Read only";
   const std::wstring kPasswordText = L"Password! ** Secret stuff **";
 
-  Clipboard clipboard;
+  ui::Clipboard clipboard;
 
   Widget* window = CreateWidget();
 #if defined(OS_WIN)
@@ -886,7 +886,7 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) {
   ::SendMessage(normal->GetTestingHandle(), WM_CUT, 0, 0);
 
   string16 result;
-  clipboard.ReadText(Clipboard::BUFFER_STANDARD, &result);
+  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
   EXPECT_EQ(kNormalText, result);
   normal->SetText(kNormalText);  // Let's revert to the original content.
 
@@ -894,7 +894,7 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) {
   read_only->SelectAll();
   ::SendMessage(read_only->GetTestingHandle(), WM_CUT, 0, 0);
   result.clear();
-  clipboard.ReadText(Clipboard::BUFFER_STANDARD, &result);
+  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
   // Cut should have failed, so the clipboard content should not have changed.
   EXPECT_EQ(kNormalText, result);
 
@@ -902,7 +902,7 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) {
   password->SelectAll();
   ::SendMessage(password->GetTestingHandle(), WM_CUT, 0, 0);
   result.clear();
-  clipboard.ReadText(Clipboard::BUFFER_STANDARD, &result);
+  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
   // Cut should have failed, so the clipboard content should not have changed.
   EXPECT_EQ(kNormalText, result);
 
@@ -915,19 +915,19 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) {
   read_only->SelectAll();
   ::SendMessage(read_only->GetTestingHandle(), WM_COPY, 0, 0);
   result.clear();
-  clipboard.ReadText(Clipboard::BUFFER_STANDARD, &result);
+  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
   EXPECT_EQ(kReadOnlyText, result);
 
   normal->SelectAll();
   ::SendMessage(normal->GetTestingHandle(), WM_COPY, 0, 0);
   result.clear();
-  clipboard.ReadText(Clipboard::BUFFER_STANDARD, &result);
+  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
   EXPECT_EQ(kNormalText, result);
 
   password->SelectAll();
   ::SendMessage(password->GetTestingHandle(), WM_COPY, 0, 0);
   result.clear();
-  clipboard.ReadText(Clipboard::BUFFER_STANDARD, &result);
+  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
   // We don't let you copy from a password field, clipboard should not have
   // changed.
   EXPECT_EQ(kNormalText, result);
diff --git a/views/views_delegate.h b/views/views_delegate.h
index 27e4498..66d91a7 100644
--- a/views/views_delegate.h
+++ b/views/views_delegate.h
@@ -13,12 +13,14 @@
 
 #include "views/accessibility/accessibility_types.h"
 
-class Clipboard;
-
 namespace gfx {
 class Rect;
 }
 
+namespace ui {
+class Clipboard;
+}
+
 namespace views {
 
 class View;
@@ -34,7 +36,7 @@ class ViewsDelegate {
   virtual ~ViewsDelegate() {}
 
   // Gets the clipboard.
-  virtual Clipboard* GetClipboard() const = 0;
+  virtual ui::Clipboard* GetClipboard() const = 0;
 
   // Saves the position, size and maximized state for the window with the
   // specified name.