diff options
Diffstat (limited to 'chrome')
28 files changed, 182 insertions, 165 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.h b/chrome/browser/autocomplete/autocomplete_edit_view_mac.h index d486cc5..fc974ad 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.h @@ -15,10 +15,13 @@ class AutocompleteEditController; class AutocompletePopupViewMac; -class Clipboard; class Profile; class ToolbarModel; +namespace ui { +class Clipboard; +} + // Implements AutocompleteEditView on an AutocompleteTextField. class AutocompleteEditViewMac : public AutocompleteEditView, @@ -107,7 +110,7 @@ class AutocompleteEditViewMac : public AutocompleteEditView, // Helper to get appropriate contents from |clipboard|. Returns // empty string if no appropriate data is found on |clipboard|. - static std::wstring GetClipboardText(Clipboard* clipboard); + static std::wstring GetClipboardText(ui::Clipboard* clipboard); // Helper to get the font to use in the field, exposed for the // popup. diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm index ce2c0f1..c19d5727 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm @@ -6,8 +6,6 @@ #include <Carbon/Carbon.h> // kVK_Return -#include "app/clipboard/clipboard.h" -#include "app/clipboard/scoped_clipboard_writer.h" #include "app/mac/nsimage_cache.h" #include "app/resource_bundle.h" #include "base/string_util.h" @@ -25,6 +23,7 @@ #include "grit/theme_resources.h" #include "net/base/escape.h" #import "third_party/mozilla/NSPasteboard+Utils.h" +#include "ui/base/clipboard/clipboard.h" // Focus-handling between |field_| and |model_| is a bit subtle. // Other platforms detect change of focus, which is inconvenient @@ -1042,15 +1041,16 @@ void AutocompleteEditViewMac::FocusLocation(bool select_all) { // TODO(shess): Copied from autocomplete_edit_view_win.cc. Could this // be pushed into the model? -std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) { +std::wstring AutocompleteEditViewMac::GetClipboardText( + ui::Clipboard* clipboard) { // autocomplete_edit_view_win.cc assumes this can never happen, we // will too. DCHECK(clipboard); - if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType(), - Clipboard::BUFFER_STANDARD)) { + if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(), + ui::Clipboard::BUFFER_STANDARD)) { string16 text16; - clipboard->ReadText(Clipboard::BUFFER_STANDARD, &text16); + clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &text16); // Note: Unlike in the find popup and textfield view, here we completely // remove whitespace strings containing newlines. We assume users are @@ -1068,8 +1068,8 @@ std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) { // and pastes from the URL bar to itself, the text will get fixed up and // cannonicalized, which is not what the user expects. By pasting in this // order, we are sure to paste what the user copied. - if (clipboard->IsFormatAvailable(Clipboard::GetUrlWFormatType(), - Clipboard::BUFFER_STANDARD)) { + if (clipboard->IsFormatAvailable(ui::Clipboard::GetUrlWFormatType(), + ui::Clipboard::BUFFER_STANDARD)) { std::string url_str; clipboard->ReadBookmark(NULL, &url_str); // pass resulting url string through GURL to normalize diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm index bf61499..da52d28 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm @@ -4,23 +4,23 @@ #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" -#include "app/clipboard/clipboard.h" -#include "app/clipboard/scoped_clipboard_writer.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "gfx/size.h" #include "testing/platform_test.h" +#include "ui/base/clipboard/clipboard.h" +#include "ui/base/clipboard/scoped_clipboard_writer.h" namespace { TEST(AutocompleteEditViewMacTest, GetClipboardText) { - Clipboard clipboard; + ui::Clipboard clipboard; std::wstring text; // Does an empty clipboard get empty text? - clipboard.WriteObjects(Clipboard::ObjectMap()); + clipboard.WriteObjects(ui::Clipboard::ObjectMap()); text = AutocompleteEditViewMac::GetClipboardText(&clipboard); EXPECT_EQ(std::wstring(), text); @@ -30,7 +30,7 @@ TEST(AutocompleteEditViewMacTest, GetClipboardText) { // Can we pull straight text off the clipboard? { - ScopedClipboardWriter clipboard_writer(&clipboard); + ui::ScopedClipboardWriter clipboard_writer(&clipboard); clipboard_writer.WriteText(plainText); } @@ -39,7 +39,7 @@ TEST(AutocompleteEditViewMacTest, GetClipboardText) { // Can we pull a bookmark off the clipboard? { - ScopedClipboardWriter clipboard_writer(&clipboard); + ui::ScopedClipboardWriter clipboard_writer(&clipboard); clipboard_writer.WriteBookmark(title, url); } @@ -48,7 +48,7 @@ TEST(AutocompleteEditViewMacTest, GetClipboardText) { // Do we pull text in preference to a bookmark? { - ScopedClipboardWriter clipboard_writer(&clipboard); + ui::ScopedClipboardWriter clipboard_writer(&clipboard); clipboard_writer.WriteText(plainText); clipboard_writer.WriteBookmark(title, url); } @@ -59,7 +59,7 @@ TEST(AutocompleteEditViewMacTest, GetClipboardText) { // Do we get nothing if there is neither text nor a bookmark? { const string16 markup(ASCIIToUTF16("<strong>Hi!</string>")); - ScopedClipboardWriter clipboard_writer(&clipboard); + ui::ScopedClipboardWriter clipboard_writer(&clipboard); clipboard_writer.WriteHTML(markup, url); } diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index df2a8ba..fa32d13 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -11,8 +11,6 @@ #include <richedit.h> #include <textserv.h> -#include "app/clipboard/clipboard.h" -#include "app/clipboard/scoped_clipboard_writer.h" #include "app/keyboard_codes.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" @@ -50,6 +48,8 @@ #include "grit/generated_resources.h" #include "net/base/escape.h" #include "skia/ext/skia_utils_win.h" +#include "ui/base/clipboard/clipboard.h" +#include "ui/base/clipboard/scoped_clipboard_writer.h" #include "views/drag_utils.h" #include "views/focus/focus_util_win.h" #include "views/widget/widget.h" @@ -1252,7 +1252,7 @@ void AutocompleteEditViewWin::OnCopy() { // GetSel() doesn't preserve selection direction, so sel.cpMin will always be // the smaller value. model_->AdjustTextForCopy(sel.cpMin, IsSelectAll(), &text, &url, &write_url); - ScopedClipboardWriter scw(g_browser_process->clipboard()); + ui::ScopedClipboardWriter scw(g_browser_process->clipboard()); scw.WriteText(text); if (write_url) { scw.WriteBookmark(text, url.spec()); @@ -2360,11 +2360,11 @@ void AutocompleteEditViewWin::TextChanged() { std::wstring AutocompleteEditViewWin::GetClipboardText() const { // Try text format. - Clipboard* clipboard = g_browser_process->clipboard(); - if (clipboard->IsFormatAvailable(Clipboard::GetPlainTextWFormatType(), - Clipboard::BUFFER_STANDARD)) { + ui::Clipboard* clipboard = g_browser_process->clipboard(); + if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(), + ui::Clipboard::BUFFER_STANDARD)) { std::wstring text; - clipboard->ReadText(Clipboard::BUFFER_STANDARD, &text); + clipboard->ReadText(ui::Clipboard::BUFFER_STANDARD, &text); // Note: Unlike in the find popup and textfield view, here we completely // remove whitespace strings containing newlines. We assume users are @@ -2382,8 +2382,8 @@ std::wstring AutocompleteEditViewWin::GetClipboardText() const { // and pastes from the URL bar to itself, the text will get fixed up and // cannonicalized, which is not what the user expects. By pasting in this // order, we are sure to paste what the user copied. - if (clipboard->IsFormatAvailable(Clipboard::GetUrlWFormatType(), - Clipboard::BUFFER_STANDARD)) { + if (clipboard->IsFormatAvailable(ui::Clipboard::GetUrlWFormatType(), + ui::Clipboard::BUFFER_STANDARD)) { std::string url_str; clipboard->ReadBookmark(NULL, &url_str); // pass resulting url string through GURL to normalize diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc index 27e8683..e51c17c 100644 --- a/chrome/browser/bookmarks/bookmark_node_data.cc +++ b/chrome/browser/bookmarks/bookmark_node_data.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/clipboard/scoped_clipboard_writer.h" #include "base/basictypes.h" #include "base/pickle.h" #include "base/string_util.h" @@ -15,6 +14,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" #include "net/base/escape.h" +#include "ui/base/clipboard/scoped_clipboard_writer.h" #if defined(OS_MACOSX) #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" @@ -140,7 +140,7 @@ bool BookmarkNodeData::ReadFromTuple(const GURL& url, const string16& title) { #if !defined(OS_MACOSX) void BookmarkNodeData::WriteToClipboard(Profile* profile) const { - ScopedClipboardWriter scw(g_browser_process->clipboard()); + ui::ScopedClipboardWriter scw(g_browser_process->clipboard()); // If there is only one element and it is a URL, write the URL to the // clipboard. @@ -166,7 +166,7 @@ void BookmarkNodeData::WriteToClipboard(Profile* profile) const { bool BookmarkNodeData::ReadFromClipboard() { std::string data; - Clipboard* clipboard = g_browser_process->clipboard(); + ui::Clipboard* clipboard = g_browser_process->clipboard(); clipboard->ReadData(kClipboardFormatString, &data); if (!data.empty()) { @@ -194,7 +194,7 @@ bool BookmarkNodeData::ReadFromClipboard() { bool BookmarkNodeData::ClipboardContainsBookmarks() { return g_browser_process->clipboard()->IsFormatAvailableByString( - BookmarkNodeData::kClipboardFormatString, Clipboard::BUFFER_STANDARD); + BookmarkNodeData::kClipboardFormatString, ui::Clipboard::BUFFER_STANDARD); } #else void BookmarkNodeData::WriteToClipboard(Profile* profile) const { diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc index 9de3b66..b1e3577 100644 --- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc @@ -4,12 +4,12 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "app/clipboard/scoped_clipboard_writer.h" #include "base/message_loop.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" +#include "ui/base/clipboard/scoped_clipboard_writer.h" #if !defined(OS_MACOSX) #include "chrome/browser/browser_process.h" @@ -121,7 +121,7 @@ TEST_F(BookmarkUtilsTest, CopyPaste) { // Write some text to the clipboard. { - ScopedClipboardWriter clipboard_writer(g_browser_process->clipboard()); + ui::ScopedClipboardWriter clipboard_writer(g_browser_process->clipboard()); clipboard_writer.WriteText(ASCIIToUTF16("foo")); } diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h index 409771a..1f335c0 100644 --- a/chrome/browser/browser_process.h +++ b/chrome/browser/browser_process.h @@ -23,7 +23,6 @@ namespace safe_browsing { class ClientSideDetectionService; } -class Clipboard; class DevToolsManager; class DownloadRequestLimiter; class DownloadStatusUpdater; @@ -54,6 +53,10 @@ namespace policy { class ConfigurationPolicyProviderKeeper; } +namespace ui { +class Clipboard; +} + // NOT THREAD SAFE, call only from the main thread. // These functions shouldn't return NULL unless otherwise noted. class BrowserProcess { @@ -75,7 +78,7 @@ class BrowserProcess { virtual PrefService* local_state() = 0; virtual DevToolsManager* devtools_manager() = 0; virtual SidebarManager* sidebar_manager() = 0; - virtual Clipboard* clipboard() = 0; + virtual ui::Clipboard* clipboard() = 0; // Returns the manager for desktop notifications. virtual NotificationUIManager* notification_ui_manager() = 0; diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index d6228eb..7a14807 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -6,7 +6,6 @@ #include <map> -#include "app/clipboard/clipboard.h" #include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_util.h" @@ -62,6 +61,7 @@ #include "chrome/common/switch_utils.h" #include "chrome/installer/util/google_update_constants.h" #include "ipc/ipc_logging.h" +#include "ui/base/clipboard/clipboard.h" #include "webkit/database/database_tracker.h" #if defined(OS_WIN) @@ -109,7 +109,7 @@ BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line) using_new_frames_(false), have_inspector_files_(true) { g_browser_process = this; - clipboard_.reset(new Clipboard); + clipboard_.reset(new ui::Clipboard); main_notification_service_.reset(new NotificationService); notification_registrar_.Add(this, @@ -407,7 +407,7 @@ SidebarManager* BrowserProcessImpl::sidebar_manager() { return sidebar_manager_.get(); } -Clipboard* BrowserProcessImpl::clipboard() { +ui::Clipboard* BrowserProcessImpl::clipboard() { DCHECK(CalledOnValidThread()); return clipboard_.get(); } diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index 8ec6f81..d3c03c5 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -59,7 +59,7 @@ class BrowserProcessImpl : public BrowserProcess, virtual PrefService* local_state(); virtual DevToolsManager* devtools_manager(); virtual SidebarManager* sidebar_manager(); - virtual Clipboard* clipboard(); + virtual ui::Clipboard* clipboard(); virtual NotificationUIManager* notification_ui_manager(); virtual policy::ConfigurationPolicyProviderKeeper* configuration_policy_provider_keeper(); @@ -188,7 +188,7 @@ class BrowserProcessImpl : public BrowserProcess, scoped_refptr<printing::PrintPreviewTabController> print_preview_tab_controller_; - scoped_ptr<Clipboard> clipboard_; + scoped_ptr<ui::Clipboard> clipboard_; // Manager for desktop notification UI. bool created_notification_ui_manager_; diff --git a/chrome/browser/clipboard_dispatcher.h b/chrome/browser/clipboard_dispatcher.h index 8b9b4eb..3ca3281 100644 --- a/chrome/browser/clipboard_dispatcher.h +++ b/chrome/browser/clipboard_dispatcher.h @@ -8,9 +8,9 @@ #include <vector> -#include "app/clipboard/clipboard.h" #include "base/basictypes.h" #include "base/string16.h" +#include "ui/base/clipboard/clipboard.h" // This class backs IPC requests from the renderer for clipboard data. In this // context, clipboard does not only refer to the usual concept of a clipboard @@ -23,12 +23,12 @@ // selection. class ClipboardDispatcher { public: - static bool ReadAvailableTypes(Clipboard::Buffer buffer, + static bool ReadAvailableTypes(ui::Clipboard::Buffer buffer, std::vector<string16>* types, bool* contains_filenames); - static bool ReadData(Clipboard::Buffer buffer, const string16& type, + static bool ReadData(ui::Clipboard::Buffer buffer, const string16& type, string16* data, string16* metadata); - static bool ReadFilenames(Clipboard::Buffer buffer, + static bool ReadFilenames(ui::Clipboard::Buffer buffer, std::vector<string16>* filenames); private: diff --git a/chrome/browser/clipboard_dispatcher_gtk.cc b/chrome/browser/clipboard_dispatcher_gtk.cc index a448468..f5a456f 100644 --- a/chrome/browser/clipboard_dispatcher_gtk.cc +++ b/chrome/browser/clipboard_dispatcher_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/clipboard_dispatcher.h" #include "base/logging.h" -bool ClipboardDispatcher::ReadAvailableTypes(Clipboard::Buffer buffer, +bool ClipboardDispatcher::ReadAvailableTypes(ui::Clipboard::Buffer buffer, std::vector<string16>* types, bool* contains_filenames) { DCHECK(types); @@ -15,7 +15,7 @@ bool ClipboardDispatcher::ReadAvailableTypes(Clipboard::Buffer buffer, return false; } -bool ClipboardDispatcher::ReadData(Clipboard::Buffer buffer, +bool ClipboardDispatcher::ReadData(ui::Clipboard::Buffer buffer, const string16& type, string16* data, string16* metadata) { @@ -24,7 +24,7 @@ bool ClipboardDispatcher::ReadData(Clipboard::Buffer buffer, return false; } -bool ClipboardDispatcher::ReadFilenames(Clipboard::Buffer buffer, +bool ClipboardDispatcher::ReadFilenames(ui::Clipboard::Buffer buffer, std::vector<string16>* filenames) { DCHECK(filenames); filenames->clear(); diff --git a/chrome/browser/clipboard_dispatcher_mac.mm b/chrome/browser/clipboard_dispatcher_mac.mm index ce7e39b..e91f452 100644 --- a/chrome/browser/clipboard_dispatcher_mac.mm +++ b/chrome/browser/clipboard_dispatcher_mac.mm @@ -5,7 +5,7 @@ #include "chrome/browser/clipboard_dispatcher.h" #include "base/logging.h" -bool ClipboardDispatcher::ReadAvailableTypes(Clipboard::Buffer buffer, +bool ClipboardDispatcher::ReadAvailableTypes(ui::Clipboard::Buffer buffer, std::vector<string16>* types, bool* contains_filenames) { DCHECK(types); @@ -15,7 +15,7 @@ bool ClipboardDispatcher::ReadAvailableTypes(Clipboard::Buffer buffer, return false; } -bool ClipboardDispatcher::ReadData(Clipboard::Buffer buffer, +bool ClipboardDispatcher::ReadData(ui::Clipboard::Buffer buffer, const string16& type, string16* data, string16* metadata) { @@ -24,7 +24,7 @@ bool ClipboardDispatcher::ReadData(Clipboard::Buffer buffer, return false; } -bool ClipboardDispatcher::ReadFilenames(Clipboard::Buffer buffer, +bool ClipboardDispatcher::ReadFilenames(ui::Clipboard::Buffer buffer, std::vector<string16>* filenames) { DCHECK(filenames); filenames->clear(); diff --git a/chrome/browser/clipboard_dispatcher_win.cc b/chrome/browser/clipboard_dispatcher_win.cc index a448468..f5a456f 100644 --- a/chrome/browser/clipboard_dispatcher_win.cc +++ b/chrome/browser/clipboard_dispatcher_win.cc @@ -5,7 +5,7 @@ #include "chrome/browser/clipboard_dispatcher.h" #include "base/logging.h" -bool ClipboardDispatcher::ReadAvailableTypes(Clipboard::Buffer buffer, +bool ClipboardDispatcher::ReadAvailableTypes(ui::Clipboard::Buffer buffer, std::vector<string16>* types, bool* contains_filenames) { DCHECK(types); @@ -15,7 +15,7 @@ bool ClipboardDispatcher::ReadAvailableTypes(Clipboard::Buffer buffer, return false; } -bool ClipboardDispatcher::ReadData(Clipboard::Buffer buffer, +bool ClipboardDispatcher::ReadData(ui::Clipboard::Buffer buffer, const string16& type, string16* data, string16* metadata) { @@ -24,7 +24,7 @@ bool ClipboardDispatcher::ReadData(Clipboard::Buffer buffer, return false; } -bool ClipboardDispatcher::ReadFilenames(Clipboard::Buffer buffer, +bool ClipboardDispatcher::ReadFilenames(ui::Clipboard::Buffer buffer, std::vector<string16>* filenames) { DCHECK(filenames); filenames->clear(); diff --git a/chrome/browser/net/browser_url_util.cc b/chrome/browser/net/browser_url_util.cc index 786ab7d..8471140 100644 --- a/chrome/browser/net/browser_url_util.cc +++ b/chrome/browser/net/browser_url_util.cc @@ -4,18 +4,18 @@ #include "chrome/browser/net/browser_url_util.h" -#include "app/clipboard/scoped_clipboard_writer.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" +#include "ui/base/clipboard/scoped_clipboard_writer.h" namespace chrome_browser_net { void WriteURLToClipboard(const GURL& url, const std::string& languages, - Clipboard *clipboard) { + ui::Clipboard *clipboard) { if (url.is_empty() || !url.is_valid() || !clipboard) return; @@ -26,7 +26,7 @@ void WriteURLToClipboard(const GURL& url, net::FormatUrl(url, languages, net::kFormatUrlOmitNothing, UnescapeRule::NONE, NULL, NULL, NULL); - ScopedClipboardWriter scw(clipboard); + ui::ScopedClipboardWriter scw(clipboard); scw.WriteURL(text); } diff --git a/chrome/browser/net/browser_url_util.h b/chrome/browser/net/browser_url_util.h index 043725f7..2199d36 100644 --- a/chrome/browser/net/browser_url_util.h +++ b/chrome/browser/net/browser_url_util.h @@ -8,15 +8,18 @@ #include <string> -class Clipboard; class GURL; +namespace ui { +class Clipboard; +} + namespace chrome_browser_net { // Writes a string representation of |url| to the system clipboard. void WriteURLToClipboard(const GURL& url, const std::string& languages, - Clipboard *clipboard); + ui::Clipboard *clipboard); } // namespace chrome_browser_net diff --git a/chrome/browser/renderer_host/render_message_filter.cc b/chrome/browser/renderer_host/render_message_filter.cc index 1f86ca8..73af165 100644 --- a/chrome/browser/renderer_host/render_message_filter.cc +++ b/chrome/browser/renderer_host/render_message_filter.cc @@ -131,7 +131,7 @@ class ContextMenuMessageDispatcher : public Task { // contents. class WriteClipboardTask : public Task { public: - explicit WriteClipboardTask(Clipboard::ObjectMap* objects) + explicit WriteClipboardTask(ui::Clipboard::ObjectMap* objects) : objects_(objects) {} ~WriteClipboardTask() {} @@ -140,7 +140,7 @@ class WriteClipboardTask : public Task { } private: - scoped_ptr<Clipboard::ObjectMap> objects_; + scoped_ptr<ui::Clipboard::ObjectMap> objects_; }; void RenderParamsFromPrintSettings(const printing::PrintSettings& settings, @@ -741,7 +741,7 @@ void RenderMessageFilter::OnDownloadUrl(const IPC::Message& message, } void RenderMessageFilter::OnClipboardWriteObjectsSync( - const Clipboard::ObjectMap& objects, + const ui::Clipboard::ObjectMap& objects, base::SharedMemoryHandle bitmap_handle) { DCHECK(base::SharedMemory::IsHandleValid(bitmap_handle)) << "Bad bitmap handle"; @@ -749,11 +749,12 @@ void RenderMessageFilter::OnClipboardWriteObjectsSync( // on the UI thread. We'll copy the relevant data and get a handle to any // shared memory so it doesn't go away when we resume the renderer, and post // a task to perform the write on the UI thread. - Clipboard::ObjectMap* long_living_objects = new Clipboard::ObjectMap(objects); + ui::Clipboard::ObjectMap* long_living_objects = + new ui::Clipboard::ObjectMap(objects); // Splice the shared memory handle into the clipboard data. - Clipboard::ReplaceSharedMemHandle(long_living_objects, bitmap_handle, - peer_handle()); + ui::Clipboard::ReplaceSharedMemHandle(long_living_objects, bitmap_handle, + peer_handle()); BrowserThread::PostTask( BrowserThread::UI, @@ -762,15 +763,16 @@ void RenderMessageFilter::OnClipboardWriteObjectsSync( } void RenderMessageFilter::OnClipboardWriteObjectsAsync( - const Clipboard::ObjectMap& objects) { + const ui::Clipboard::ObjectMap& objects) { // We cannot write directly from the IO thread, and cannot service the IPC // on the UI thread. We'll copy the relevant data and post a task to preform // the write on the UI thread. - Clipboard::ObjectMap* long_living_objects = new Clipboard::ObjectMap(objects); + ui::Clipboard::ObjectMap* long_living_objects = + new ui::Clipboard::ObjectMap(objects); // This async message doesn't support shared-memory based bitmaps; they must // be removed otherwise we might dereference a rubbish pointer. - long_living_objects->erase(Clipboard::CBF_SMBITMAP); + long_living_objects->erase(ui::Clipboard::CBF_SMBITMAP); BrowserThread::PostTask( BrowserThread::UI, @@ -791,14 +793,14 @@ void RenderMessageFilter::OnClipboardWriteObjectsAsync( // functions. void RenderMessageFilter::OnClipboardIsFormatAvailable( - Clipboard::FormatType format, Clipboard::Buffer buffer, + ui::Clipboard::FormatType format, ui::Clipboard::Buffer buffer, IPC::Message* reply) { const bool result = GetClipboard()->IsFormatAvailable(format, buffer); ViewHostMsg_ClipboardIsFormatAvailable::WriteReplyParams(reply, result); Send(reply); } -void RenderMessageFilter::OnClipboardReadText(Clipboard::Buffer buffer, +void RenderMessageFilter::OnClipboardReadText(ui::Clipboard::Buffer buffer, IPC::Message* reply) { string16 result; GetClipboard()->ReadText(buffer, &result); @@ -806,7 +808,7 @@ void RenderMessageFilter::OnClipboardReadText(Clipboard::Buffer buffer, Send(reply); } -void RenderMessageFilter::OnClipboardReadAsciiText(Clipboard::Buffer buffer, +void RenderMessageFilter::OnClipboardReadAsciiText(ui::Clipboard::Buffer buffer, IPC::Message* reply) { std::string result; GetClipboard()->ReadAsciiText(buffer, &result); @@ -814,7 +816,7 @@ void RenderMessageFilter::OnClipboardReadAsciiText(Clipboard::Buffer buffer, Send(reply); } -void RenderMessageFilter::OnClipboardReadHTML(Clipboard::Buffer buffer, +void RenderMessageFilter::OnClipboardReadHTML(ui::Clipboard::Buffer buffer, IPC::Message* reply) { std::string src_url_str; string16 markup; @@ -826,7 +828,7 @@ void RenderMessageFilter::OnClipboardReadHTML(Clipboard::Buffer buffer, } void RenderMessageFilter::OnClipboardReadAvailableTypes( - Clipboard::Buffer buffer, IPC::Message* reply) { + ui::Clipboard::Buffer buffer, IPC::Message* reply) { std::vector<string16> types; bool contains_filenames = false; bool result = ClipboardDispatcher::ReadAvailableTypes( @@ -837,7 +839,7 @@ void RenderMessageFilter::OnClipboardReadAvailableTypes( } void RenderMessageFilter::OnClipboardReadData( - Clipboard::Buffer buffer, const string16& type, IPC::Message* reply) { + ui::Clipboard::Buffer buffer, const string16& type, IPC::Message* reply) { string16 data; string16 metadata; bool result = ClipboardDispatcher::ReadData(buffer, type, &data, &metadata); @@ -847,7 +849,7 @@ void RenderMessageFilter::OnClipboardReadData( } void RenderMessageFilter::OnClipboardReadFilenames( - Clipboard::Buffer buffer, IPC::Message* reply) { + ui::Clipboard::Buffer buffer, IPC::Message* reply) { std::vector<string16> filenames; bool result = ClipboardDispatcher::ReadFilenames(buffer, &filenames); ViewHostMsg_ClipboardReadFilenames::WriteReplyParams( @@ -1109,10 +1111,10 @@ void RenderMessageFilter::OnScriptedPrintReply( } // static -Clipboard* RenderMessageFilter::GetClipboard() { +ui::Clipboard* RenderMessageFilter::GetClipboard() { // We have a static instance of the clipboard service for use by all message // filters. This instance lives for the life of the browser processes. - static Clipboard* clipboard = new Clipboard; + static ui::Clipboard* clipboard = new ui::Clipboard; return clipboard; } diff --git a/chrome/browser/renderer_host/render_message_filter.h b/chrome/browser/renderer_host/render_message_filter.h index 98e8402..a777b3a 100644 --- a/chrome/browser/renderer_host/render_message_filter.h +++ b/chrome/browser/renderer_host/render_message_filter.h @@ -13,7 +13,6 @@ #include <string> #include <vector> -#include "app/clipboard/clipboard.h" #include "app/surface/transport_dib.h" #include "base/file_path.h" #include "base/linked_ptr.h" @@ -28,6 +27,7 @@ #include "gfx/native_widget_types.h" #include "third_party/WebKit/WebKit/chromium/public/WebCache.h" #include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h" +#include "ui/base/clipboard/clipboard.h" class ChromeURLRequestContext; struct FontDescriptor; @@ -182,24 +182,26 @@ class RenderMessageFilter : public BrowserMessageFilter, #endif void OnReceiveContextMenuMsg(const IPC::Message& msg); // Clipboard messages - void OnClipboardWriteObjectsAsync(const Clipboard::ObjectMap& objects); - void OnClipboardWriteObjectsSync(const Clipboard::ObjectMap& objects, + void OnClipboardWriteObjectsAsync(const ui::Clipboard::ObjectMap& objects); + void OnClipboardWriteObjectsSync(const ui::Clipboard::ObjectMap& objects, base::SharedMemoryHandle bitmap_handle); - void OnClipboardIsFormatAvailable(Clipboard::FormatType format, - Clipboard::Buffer buffer, + void OnClipboardIsFormatAvailable(ui::Clipboard::FormatType format, + ui::Clipboard::Buffer buffer, IPC::Message* reply); - void OnClipboardReadText(Clipboard::Buffer buffer, IPC::Message* reply); - void OnClipboardReadAsciiText(Clipboard::Buffer buffer, IPC::Message* reply); - void OnClipboardReadHTML(Clipboard::Buffer buffer, IPC::Message* reply); + void OnClipboardReadText(ui::Clipboard::Buffer buffer, IPC::Message* reply); + void OnClipboardReadAsciiText(ui::Clipboard::Buffer buffer, + IPC::Message* reply); + void OnClipboardReadHTML(ui::Clipboard::Buffer buffer, IPC::Message* reply); #if defined(OS_MACOSX) void OnClipboardFindPboardWriteString(const string16& text); #endif - void OnClipboardReadAvailableTypes(Clipboard::Buffer buffer, + void OnClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer, IPC::Message* reply); - void OnClipboardReadData(Clipboard::Buffer buffer, const string16& type, + void OnClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type, IPC::Message* reply); - void OnClipboardReadFilenames(Clipboard::Buffer buffer, IPC::Message* reply); + void OnClipboardReadFilenames(ui::Clipboard::Buffer buffer, + IPC::Message* reply); void OnCheckNotificationPermission(const GURL& source_url, int* permission_level); @@ -340,18 +342,20 @@ class RenderMessageFilter : public BrowserMessageFilter, void DoOnGetScreenInfo(gfx::NativeViewId view, IPC::Message* reply_msg); void DoOnGetWindowRect(gfx::NativeViewId view, IPC::Message* reply_msg); void DoOnGetRootWindowRect(gfx::NativeViewId view, IPC::Message* reply_msg); - void DoOnClipboardIsFormatAvailable(Clipboard::FormatType format, - Clipboard::Buffer buffer, + void DoOnClipboardIsFormatAvailable(ui::Clipboard::FormatType format, + ui::Clipboard::Buffer buffer, IPC::Message* reply_msg); - void DoOnClipboardReadText(Clipboard::Buffer buffer, IPC::Message* reply_msg); - void DoOnClipboardReadAsciiText(Clipboard::Buffer buffer, + void DoOnClipboardReadText(ui::Clipboard::Buffer buffer, + IPC::Message* reply_msg); + void DoOnClipboardReadAsciiText(ui::Clipboard::Buffer buffer, IPC::Message* reply_msg); - void DoOnClipboardReadHTML(Clipboard::Buffer buffer, IPC::Message* reply_msg); - void DoOnClipboardReadAvailableTypes(Clipboard::Buffer buffer, + void DoOnClipboardReadHTML(ui::Clipboard::Buffer buffer, + IPC::Message* reply_msg); + void DoOnClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer, IPC::Message* reply_msg); - void DoOnClipboardReadData(Clipboard::Buffer buffer, const string16& type, + void DoOnClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type, IPC::Message* reply_msg); - void DoOnClipboardReadFilenames(Clipboard::Buffer buffer, + void DoOnClipboardReadFilenames(ui::Clipboard::Buffer buffer, IPC::Message* reply_msg); void DoOnAllocateTempFileForPrinting(IPC::Message* reply_msg); #endif @@ -363,7 +367,7 @@ class RenderMessageFilter : public BrowserMessageFilter, // IO thread instead of forwarding (possibly synchronous) messages to the UI // thread. This instance of the clipboard should be accessed only on the IO // thread. - static Clipboard* GetClipboard(); + static ui::Clipboard* GetClipboard(); // Cached resource request dispatcher host and plugin service, guaranteed to // be non-null if Init succeeds. We do not own the objects, they are managed diff --git a/chrome/browser/renderer_host/render_message_filter_gtk.cc b/chrome/browser/renderer_host/render_message_filter_gtk.cc index 4088c8a..bcc6b6c 100644 --- a/chrome/browser/renderer_host/render_message_filter_gtk.cc +++ b/chrome/browser/renderer_host/render_message_filter_gtk.cc @@ -7,7 +7,6 @@ #include <fcntl.h> #include <map> -#include "app/clipboard/clipboard.h" #include "app/x11_util.h" #include "base/file_util.h" #include "base/lazy_instance.h" @@ -22,9 +21,9 @@ #include "chrome/common/render_messages.h" #include "gfx/gtk_native_view_id_manager.h" #include "grit/generated_resources.h" - #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" #include "third_party/WebKit/WebKit/chromium/public/x11/WebScreenInfoFactory.h" +#include "ui/base/clipboard/clipboard.h" using WebKit::WebScreenInfo; using WebKit::WebScreenInfoFactory; @@ -118,7 +117,7 @@ void RenderMessageFilter::DoOnGetRootWindowRect(gfx::NativeViewId view, // Called on the UI thread. void RenderMessageFilter::DoOnClipboardIsFormatAvailable( - Clipboard::FormatType format, Clipboard::Buffer buffer, + ui::Clipboard::FormatType format, ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { const bool result = GetClipboard()->IsFormatAvailable(format, buffer); @@ -127,7 +126,7 @@ void RenderMessageFilter::DoOnClipboardIsFormatAvailable( } // Called on the UI thread. -void RenderMessageFilter::DoOnClipboardReadText(Clipboard::Buffer buffer, +void RenderMessageFilter::DoOnClipboardReadText(ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { string16 result; GetClipboard()->ReadText(buffer, &result); @@ -138,7 +137,7 @@ void RenderMessageFilter::DoOnClipboardReadText(Clipboard::Buffer buffer, // Called on the UI thread. void RenderMessageFilter::DoOnClipboardReadAsciiText( - Clipboard::Buffer buffer, IPC::Message* reply_msg) { + ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { std::string result; GetClipboard()->ReadAsciiText(buffer, &result); @@ -147,7 +146,7 @@ void RenderMessageFilter::DoOnClipboardReadAsciiText( } // Called on the UI thread. -void RenderMessageFilter::DoOnClipboardReadHTML(Clipboard::Buffer buffer, +void RenderMessageFilter::DoOnClipboardReadHTML(ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { std::string src_url_str; string16 markup; @@ -160,19 +159,19 @@ void RenderMessageFilter::DoOnClipboardReadHTML(Clipboard::Buffer buffer, // Called on the UI thread. void RenderMessageFilter::DoOnClipboardReadAvailableTypes( - Clipboard::Buffer buffer, IPC::Message* reply_msg) { + ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { Send(reply_msg); } // Called on the UI thread. -void RenderMessageFilter::DoOnClipboardReadData(Clipboard::Buffer buffer, +void RenderMessageFilter::DoOnClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type, IPC::Message* reply_msg) { Send(reply_msg); } // Called on the UI thread. void RenderMessageFilter::DoOnClipboardReadFilenames( - Clipboard::Buffer buffer, IPC::Message* reply_msg) { + ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { Send(reply_msg); } @@ -241,7 +240,7 @@ void RenderMessageFilter::OnGetRootWindowRect(gfx::NativeViewId view, // Called on the IO thread. void RenderMessageFilter::OnClipboardIsFormatAvailable( - Clipboard::FormatType format, Clipboard::Buffer buffer, + ui::Clipboard::FormatType format, ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, @@ -251,7 +250,7 @@ void RenderMessageFilter::OnClipboardIsFormatAvailable( } // Called on the IO thread. -void RenderMessageFilter::OnClipboardReadText(Clipboard::Buffer buffer, +void RenderMessageFilter::OnClipboardReadText(ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, @@ -261,7 +260,7 @@ void RenderMessageFilter::OnClipboardReadText(Clipboard::Buffer buffer, } // Called on the IO thread. -void RenderMessageFilter::OnClipboardReadAsciiText(Clipboard::Buffer buffer, +void RenderMessageFilter::OnClipboardReadAsciiText(ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, @@ -271,7 +270,7 @@ void RenderMessageFilter::OnClipboardReadAsciiText(Clipboard::Buffer buffer, } // Called on the IO thread. -void RenderMessageFilter::OnClipboardReadHTML(Clipboard::Buffer buffer, +void RenderMessageFilter::OnClipboardReadHTML(ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, @@ -282,7 +281,7 @@ void RenderMessageFilter::OnClipboardReadHTML(Clipboard::Buffer buffer, // Called on the IO thread. void RenderMessageFilter::OnClipboardReadAvailableTypes( - Clipboard::Buffer buffer, IPC::Message* reply_msg) { + ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, NewRunnableMethod( @@ -291,8 +290,9 @@ void RenderMessageFilter::OnClipboardReadAvailableTypes( } // Called on the IO thread. -void RenderMessageFilter::OnClipboardReadData( - Clipboard::Buffer buffer, const string16& type, IPC::Message* reply_msg) { +void RenderMessageFilter::OnClipboardReadData(ui::Clipboard::Buffer buffer, + const string16& type, + IPC::Message* reply_msg) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, NewRunnableMethod( @@ -302,7 +302,7 @@ void RenderMessageFilter::OnClipboardReadData( // Called on the IO thread. void RenderMessageFilter::OnClipboardReadFilenames( - Clipboard::Buffer buffer, IPC::Message* reply_msg) { + ui::Clipboard::Buffer buffer, IPC::Message* reply_msg) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, NewRunnableMethod( diff --git a/chrome/browser/tab_contents/web_drop_target_win.cc b/chrome/browser/tab_contents/web_drop_target_win.cc index d70b851..d358fe3 100644 --- a/chrome/browser/tab_contents/web_drop_target_win.cc +++ b/chrome/browser/tab_contents/web_drop_target_win.cc @@ -7,7 +7,6 @@ #include <windows.h> #include <shlobj.h> -#include "app/clipboard/clipboard_util_win.h" #include "app/os_exchange_data.h" #include "app/os_exchange_data_provider_win.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" @@ -17,6 +16,7 @@ #include "gfx/point.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" +#include "ui/base/clipboard/clipboard_util_win.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/window_open_disposition.h" @@ -51,23 +51,23 @@ class InterstitialDropTarget { : tab_contents_(tab_contents) {} DWORD OnDragEnter(IDataObject* data_object, DWORD effect) { - return ClipboardUtil::HasUrl(data_object) ? GetPreferredDropEffect(effect) - : DROPEFFECT_NONE; + return ui::ClipboardUtil::HasUrl(data_object) ? + GetPreferredDropEffect(effect) : DROPEFFECT_NONE; } DWORD OnDragOver(IDataObject* data_object, DWORD effect) { - return ClipboardUtil::HasUrl(data_object) ? GetPreferredDropEffect(effect) - : DROPEFFECT_NONE; + return ui::ClipboardUtil::HasUrl(data_object) ? + GetPreferredDropEffect(effect) : DROPEFFECT_NONE; } void OnDragLeave(IDataObject* data_object) { } DWORD OnDrop(IDataObject* data_object, DWORD effect) { - if (ClipboardUtil::HasUrl(data_object)) { + if (ui::ClipboardUtil::HasUrl(data_object)) { std::wstring url; std::wstring title; - ClipboardUtil::GetUrl(data_object, &url, &title, true); + ui::ClipboardUtil::GetUrl(data_object, &url, &title, true); tab_contents_->OpenURL(GURL(url), GURL(), CURRENT_TAB, PageTransition::AUTO_BOOKMARK); return GetPreferredDropEffect(effect); diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc index 7e51ab2..df8af57 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc @@ -34,7 +34,7 @@ class AccessibilityViewsDelegate : public views::ViewsDelegate { virtual ~AccessibilityViewsDelegate() {} // Overridden from views::ViewsDelegate: - virtual Clipboard* GetClipboard() const { return NULL; } + virtual ui::Clipboard* GetClipboard() const { return NULL; } virtual void SaveWindowPlacement(const std::wstring& window_name, const gfx::Rect& bounds, bool maximized) { diff --git a/chrome/browser/ui/views/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmark_bar_view_test.cc index d98c20f..67d2436 100644 --- a/chrome/browser/ui/views/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmark_bar_view_test.cc @@ -19,6 +19,7 @@ #include "chrome/test/interactive_ui/view_event_test_base.h" #include "chrome/test/ui_test_utils.h" #include "grit/generated_resources.h" +#include "ui/base/clipboard/clipboard.h" #include "views/controls/button/menu_button.h" #include "views/controls/button/text_button.h" #include "views/controls/menu/menu_controller.h" @@ -66,7 +67,7 @@ namespace { class ViewsDelegateImpl : public views::ViewsDelegate { public: ViewsDelegateImpl() {} - virtual Clipboard* GetClipboard() const { return NULL; } + virtual ui::Clipboard* GetClipboard() const { return NULL; } virtual void SaveWindowPlacement(const std::wstring& window_name, const gfx::Rect& bounds, bool maximized) {} diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index 7ed8ef7..b52e103 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/chrome_views_delegate.h" -#include "app/clipboard/clipboard.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -12,6 +11,7 @@ #include "chrome/browser/ui/views/accessibility_event_router_views.h" #include "chrome/browser/ui/window_sizer.h" #include "gfx/rect.h" +#include "ui/base/clipboard/clipboard.h" #if defined(OS_WIN) #include "chrome/browser/app_icon_win.h" @@ -20,7 +20,7 @@ /////////////////////////////////////////////////////////////////////////////// // ChromeViewsDelegate, views::ViewsDelegate implementation: -Clipboard* ChromeViewsDelegate::GetClipboard() const { +ui::Clipboard* ChromeViewsDelegate::GetClipboard() const { return g_browser_process->clipboard(); } diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h index 8b3a6a2..dd2e8a8 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.h +++ b/chrome/browser/ui/views/chrome_views_delegate.h @@ -16,7 +16,7 @@ class ChromeViewsDelegate : public views::ViewsDelegate { virtual ~ChromeViewsDelegate() {} // Overridden from views::ViewsDelegate: - virtual Clipboard* GetClipboard() const; + virtual ui::Clipboard* GetClipboard() const; virtual void SaveWindowPlacement(const std::wstring& window_name, const gfx::Rect& bounds, bool maximized); diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 8f6a5f7..2902124 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -11,7 +11,6 @@ // TODO(erg): This list has been temporarily annotated by erg while doing work // on which headers to pull out. -#include "app/clipboard/clipboard.h" // enum #include "base/basictypes.h" #include "base/ref_counted.h" #include "base/string16.h" @@ -23,6 +22,7 @@ #include "chrome/common/webkit_param_traits.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_platform_file.h" // ifdefed typedef. +#include "ui/base/clipboard/clipboard.h" // enum #include "webkit/appcache/appcache_interfaces.h" // enum appcache::Status #include "webkit/fileapi/file_system_types.h" // enum fileapi::FileSystemType @@ -443,30 +443,30 @@ struct ParamTraits<URLPattern> { }; template <> -struct ParamTraits<Clipboard::Buffer> { - typedef Clipboard::Buffer param_type; +struct ParamTraits<ui::Clipboard::Buffer> { + typedef ui::Clipboard::Buffer param_type; static void Write(Message* m, const param_type& p) { m->WriteInt(p); } static bool Read(const Message* m, void** iter, param_type* p) { int buffer; - if (!m->ReadInt(iter, &buffer) || !Clipboard::IsValidBuffer(buffer)) + if (!m->ReadInt(iter, &buffer) || !ui::Clipboard::IsValidBuffer(buffer)) return false; - *p = Clipboard::FromInt(buffer); + *p = ui::Clipboard::FromInt(buffer); return true; } static void Log(const param_type& p, std::string* l) { std::string type; switch (p) { - case Clipboard::BUFFER_STANDARD: + case ui::Clipboard::BUFFER_STANDARD: type = "BUFFER_STANDARD"; break; #if defined(USE_X11) - case Clipboard::BUFFER_SELECTION: + case ui::Clipboard::BUFFER_SELECTION: type = "BUFFER_SELECTION"; break; #endif - case Clipboard::BUFFER_DRAG: + case ui::Clipboard::BUFFER_DRAG: type = "BUFFER_DRAG"; break; default: diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 48280a6..5cc366e 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -1590,41 +1590,41 @@ IPC_SYNC_MESSAGE_ROUTED1_0(ViewHostMsg_DestroyPluginContainer, // This message is used when the object list does not contain a bitmap. IPC_MESSAGE_CONTROL1(ViewHostMsg_ClipboardWriteObjectsAsync, - Clipboard::ObjectMap /* objects */) + ui::Clipboard::ObjectMap /* objects */) // This message is used when the object list contains a bitmap. // It is synchronized so that the renderer knows when it is safe to // free the shared memory used to transfer the bitmap. IPC_SYNC_MESSAGE_CONTROL2_0(ViewHostMsg_ClipboardWriteObjectsSync, - Clipboard::ObjectMap /* objects */, + ui::Clipboard::ObjectMap /* objects */, base::SharedMemoryHandle /* bitmap handle */) IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_ClipboardIsFormatAvailable, std::string /* format */, - Clipboard::Buffer /* buffer */, + ui::Clipboard::Buffer /* buffer */, bool /* result */) IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_ClipboardReadText, - Clipboard::Buffer /* buffer */, + ui::Clipboard::Buffer /* buffer */, string16 /* result */) IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_ClipboardReadAsciiText, - Clipboard::Buffer /* buffer */, + ui::Clipboard::Buffer /* buffer */, std::string /* result */) IPC_SYNC_MESSAGE_CONTROL1_2(ViewHostMsg_ClipboardReadHTML, - Clipboard::Buffer /* buffer */, + ui::Clipboard::Buffer /* buffer */, string16 /* markup */, GURL /* url */) IPC_SYNC_MESSAGE_CONTROL1_3(ViewHostMsg_ClipboardReadAvailableTypes, - Clipboard::Buffer /* buffer */, + ui::Clipboard::Buffer /* buffer */, bool /* result */, std::vector<string16> /* types */, bool /* contains filenames */) IPC_SYNC_MESSAGE_CONTROL2_3(ViewHostMsg_ClipboardReadData, - Clipboard::Buffer /* buffer */, + ui::Clipboard::Buffer /* buffer */, string16 /* type */, bool /* succeeded */, string16 /* data */, string16 /* metadata */) IPC_SYNC_MESSAGE_CONTROL1_2(ViewHostMsg_ClipboardReadFilenames, - Clipboard::Buffer /* buffer */, + ui::Clipboard::Buffer /* buffer */, bool /* result */, std::vector<string16> /* filenames */) diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index ae5984b..92b80e3 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -12,7 +12,6 @@ #include <vector> -#include "app/clipboard/clipboard.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/ref_counted.h" @@ -32,6 +31,7 @@ #include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h" #include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/clipboard/clipboard.h" #include "webkit/glue/scoped_clipboard_writer_glue.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/websocketstreamhandle_bridge.h" @@ -92,19 +92,19 @@ void ScopedClipboardWriterGlue::WriteBitmapFromPixels(const void* pixels, memcpy(shared_buf_->memory(), pixels, buf_size); shared_buf_->Unmap(); - Clipboard::ObjectMapParam size_param; + ui::Clipboard::ObjectMapParam size_param; const char* size_data = reinterpret_cast<const char*>(&size); for (size_t i = 0; i < sizeof(gfx::Size); ++i) size_param.push_back(size_data[i]); - Clipboard::ObjectMapParams params; + ui::Clipboard::ObjectMapParams params; // The first parameter is replaced on the receiving end with a pointer to // a shared memory object containing the bitmap. We reserve space for it here. - Clipboard::ObjectMapParam place_holder_param; + ui::Clipboard::ObjectMapParam place_holder_param; params.push_back(place_holder_param); params.push_back(size_param); - objects_[Clipboard::CBF_SMBITMAP] = params; + objects_[ui::Clipboard::CBF_SMBITMAP] = params; } // Define a destructor that makes IPCs to flush the contents to the @@ -153,34 +153,35 @@ HCURSOR LoadCursor(int cursor_id) { // Clipboard glue -Clipboard* ClipboardGetClipboard() { +ui::Clipboard* ClipboardGetClipboard() { return NULL; } -bool ClipboardIsFormatAvailable(const Clipboard::FormatType& format, - Clipboard::Buffer buffer) { +bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format, + ui::Clipboard::Buffer buffer) { bool result; RenderThread::current()->Send( new ViewHostMsg_ClipboardIsFormatAvailable(format, buffer, &result)); return result; } -void ClipboardReadText(Clipboard::Buffer buffer, string16* result) { +void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result) { RenderThread::current()->Send(new ViewHostMsg_ClipboardReadText(buffer, result)); } -void ClipboardReadAsciiText(Clipboard::Buffer buffer, std::string* result) { +void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result) { RenderThread::current()->Send(new ViewHostMsg_ClipboardReadAsciiText(buffer, result)); } -void ClipboardReadHTML(Clipboard::Buffer buffer, string16* markup, GURL* url) { +void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup, + GURL* url) { RenderThread::current()->Send(new ViewHostMsg_ClipboardReadHTML(buffer, markup, url)); } -bool ClipboardReadAvailableTypes(Clipboard::Buffer buffer, +bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer, std::vector<string16>* types, bool* contains_filenames) { bool result = false; @@ -189,7 +190,7 @@ bool ClipboardReadAvailableTypes(Clipboard::Buffer buffer, return result; } -bool ClipboardReadData(Clipboard::Buffer buffer, const string16& type, +bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type, string16* data, string16* metadata) { bool result = false; RenderThread::current()->Send(new ViewHostMsg_ClipboardReadData( @@ -197,7 +198,7 @@ bool ClipboardReadData(Clipboard::Buffer buffer, const string16& type, return result; } -bool ClipboardReadFilenames(Clipboard::Buffer buffer, +bool ClipboardReadFilenames(ui::Clipboard::Buffer buffer, std::vector<string16>* filenames) { bool result; RenderThread::current()->Send(new ViewHostMsg_ClipboardReadFilenames( diff --git a/chrome/test/plugin/pdf_browsertest.cc b/chrome/test/plugin/pdf_browsertest.cc index 52b4bee..769df46 100644 --- a/chrome/test/plugin/pdf_browsertest.cc +++ b/chrome/test/plugin/pdf_browsertest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/clipboard/clipboard.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" @@ -22,6 +21,7 @@ #include "chrome/test/ui_test_utils.h" #include "gfx/codec/png_codec.h" #include "net/test/test_server.h" +#include "ui/base/clipboard/clipboard.h" extern base::hash_map<std::string, int> g_test_timeout_overrides; @@ -266,10 +266,10 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) { false, NULL)); // Verify that copying selected text works. - Clipboard clipboard; + ui::Clipboard clipboard; // Reset the clipboard first. - Clipboard::ObjectMap objects; - Clipboard::ObjectMapParams params; + ui::Clipboard::ObjectMap objects; + ui::Clipboard::ObjectMapParams params; params.push_back(std::vector<char>()); objects[Clipboard::CBF_TEXT] = params; clipboard.WriteObjects(objects); @@ -278,7 +278,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) { ASSERT_NO_FATAL_FAILURE(WaitForResponse()); std::string text; - clipboard.ReadAsciiText(Clipboard::BUFFER_STANDARD, &text); + clipboard.ReadAsciiText(ui::Clipboard::BUFFER_STANDARD, &text); ASSERT_EQ("adipiscing", text); } diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h index 64a11a2..5feada8 100644 --- a/chrome/test/testing_browser_process.h +++ b/chrome/test/testing_browser_process.h @@ -15,7 +15,6 @@ #include <string> -#include "app/clipboard/clipboard.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_process.h" @@ -26,6 +25,7 @@ #include "chrome/browser/policy/dummy_configuration_policy_provider.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/notification_service.h" +#include "ui/base/clipboard/clipboard.h" class IOThread; @@ -125,10 +125,10 @@ class TestingBrowserProcess : public BrowserProcess { return NULL; } - virtual Clipboard* clipboard() { + virtual ui::Clipboard* clipboard() { 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(); } @@ -210,7 +210,7 @@ class TestingBrowserProcess : public BrowserProcess { NotificationService notification_service_; scoped_ptr<base::WaitableEvent> shutdown_event_; unsigned int module_ref_count_; - scoped_ptr<Clipboard> clipboard_; + scoped_ptr<ui::Clipboard> clipboard_; std::string app_locale_; PrefService* pref_service_; |