diff options
Diffstat (limited to 'chrome')
23 files changed, 135 insertions, 127 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 41ea7a9..8d4d4e2 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -14,8 +14,6 @@ #include "app/keyboard_codes.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" -#include "app/os_exchange_data.h" -#include "app/os_exchange_data_provider_win.h" #include "app/win/drag_source.h" #include "app/win/drop_target.h" #include "app/win/iat_patch_function.h" @@ -50,6 +48,8 @@ #include "skia/ext/skia_utils_win.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" +#include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "views/drag_utils.h" #include "views/focus/focus_util_win.h" #include "views/widget/widget.h" @@ -129,7 +129,7 @@ DWORD EditDropTarget::OnDragEnter(IDataObject* data_object, DWORD key_state, POINT cursor_position, DWORD effect) { - OSExchangeData os_data(new OSExchangeDataProviderWin(data_object)); + ui::OSExchangeData os_data(new ui::OSExchangeDataProviderWin(data_object)); drag_has_url_ = os_data.HasURL(); drag_has_string_ = !drag_has_url_ && os_data.HasString(); if (drag_has_url_) { @@ -179,7 +179,7 @@ DWORD EditDropTarget::OnDrop(IDataObject* data_object, DWORD key_state, POINT cursor_position, DWORD effect) { - OSExchangeData os_data(new OSExchangeDataProviderWin(data_object)); + ui::OSExchangeData os_data(new ui::OSExchangeDataProviderWin(data_object)); if (drag_has_url_) { GURL url; @@ -2418,7 +2418,7 @@ void AutocompleteEditViewWin::StartDragIfNecessary(const CPoint& point) { if (initiated_drag_ || !app::win::IsDrag(click_point_[kLeft], point)) return; - OSExchangeData data; + ui::OSExchangeData data; DWORD supported_modes = DROPEFFECT_COPY; @@ -2470,8 +2470,9 @@ void AutocompleteEditViewWin::StartDragIfNecessary(const CPoint& point) { scoped_refptr<app::win::DragSource> drag_source(new app::win::DragSource); DWORD dropped_mode; AutoReset<bool> auto_reset_in_drag(&in_drag_, true); - if (DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source, - supported_modes, &dropped_mode) == DRAGDROP_S_DROP) { + if (DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data), + drag_source, supported_modes, &dropped_mode) == + DRAGDROP_S_DROP) { if ((dropped_mode == DROPEFFECT_MOVE) && (start_text == GetText())) { ScopedFreeze freeze(this, GetTextObjectModel()); OnBeforePossibleChange(); diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc index e51c17c..c94d207 100644 --- a/chrome/browser/bookmarks/bookmark_node_data.cc +++ b/chrome/browser/bookmarks/bookmark_node_data.cc @@ -81,13 +81,13 @@ bool BookmarkNodeData::Element::ReadFromPickle(Pickle* pickle, #if defined(TOOLKIT_VIEWS) // static -OSExchangeData::CustomFormat BookmarkNodeData::GetBookmarkCustomFormat() { - static OSExchangeData::CustomFormat format; +ui::OSExchangeData::CustomFormat BookmarkNodeData::GetBookmarkCustomFormat() { + static ui::OSExchangeData::CustomFormat format; static bool format_valid = false; if (!format_valid) { format_valid = true; - format = OSExchangeData::RegisterCustomFormat( + format = ui::OSExchangeData::RegisterCustomFormat( BookmarkNodeData::kClipboardFormatString); } return format; @@ -217,7 +217,7 @@ bool BookmarkNodeData::ClipboardContainsBookmarks() { #endif // !defined(OS_MACOSX) #if defined(TOOLKIT_VIEWS) -void BookmarkNodeData::Write(Profile* profile, OSExchangeData* data) const { +void BookmarkNodeData::Write(Profile* profile, ui::OSExchangeData* data) const { DCHECK(data); // If there is only one element and it is a URL, write the URL to the @@ -236,7 +236,7 @@ void BookmarkNodeData::Write(Profile* profile, OSExchangeData* data) const { data->SetPickledData(GetBookmarkCustomFormat(), data_pickle); } -bool BookmarkNodeData::Read(const OSExchangeData& data) { +bool BookmarkNodeData::Read(const ui::OSExchangeData& data) { elements.clear(); profile_path_.clear(); diff --git a/chrome/browser/bookmarks/bookmark_node_data.h b/chrome/browser/bookmarks/bookmark_node_data.h index 8b8310d..d45054d 100644 --- a/chrome/browser/bookmarks/bookmark_node_data.h +++ b/chrome/browser/bookmarks/bookmark_node_data.h @@ -13,7 +13,7 @@ #include "googleurl/src/gurl.h" #if defined(TOOLKIT_VIEWS) -#include "app/os_exchange_data.h" +#include "ui/base/dragdrop/os_exchange_data.h" #endif class BookmarkNode; @@ -74,7 +74,7 @@ struct BookmarkNodeData { BookmarkNodeData(); #if defined(TOOLKIT_VIEWS) - static OSExchangeData::CustomFormat GetBookmarkCustomFormat(); + static ui::OSExchangeData::CustomFormat GetBookmarkCustomFormat(); #endif // Created a BookmarkNodeData populated from the arguments. @@ -108,10 +108,10 @@ struct BookmarkNodeData { // use. // |profile| is used to identify which profile the data came from. Use a // value of null to indicate the data is not associated with any profile. - void Write(Profile* profile, OSExchangeData* data) const; + void Write(Profile* profile, ui::OSExchangeData* data) const; // Restores this data from the clipboard, returning true on success. - bool Read(const OSExchangeData& data); + bool Read(const ui::OSExchangeData& data); #endif // Writes the data for a drag to |pickle|. diff --git a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc index a81d0a0..88f6936 100644 --- a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc @@ -1,9 +1,7 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "app/os_exchange_data.h" -#include "app/os_exchange_data_provider_win.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/string16.h" @@ -14,6 +12,8 @@ #include "chrome/test/testing_profile.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/dragdrop/os_exchange_data_provider_win.h" class BookmarkNodeDataTest : public testing::Test { public: @@ -29,9 +29,9 @@ class BookmarkNodeDataTest : public testing::Test { namespace { -OSExchangeData::Provider* CloneProvider(const OSExchangeData& data) { - return new OSExchangeDataProviderWin( - OSExchangeDataProviderWin::GetIDataObject(data)); +ui::OSExchangeData::Provider* CloneProvider(const ui::OSExchangeData& data) { + return new ui::OSExchangeDataProviderWin( + ui::OSExchangeDataProviderWin::GetIDataObject(data)); } } // namespace @@ -44,9 +44,9 @@ TEST_F(BookmarkNodeDataTest, InitialState) { // Makes sure reading bogus data leaves the BookmarkNodeData invalid. TEST_F(BookmarkNodeDataTest, BogusRead) { - OSExchangeData data; + ui::OSExchangeData data; BookmarkNodeData drag_data; - EXPECT_FALSE(drag_data.Read(OSExchangeData(CloneProvider(data)))); + EXPECT_FALSE(drag_data.Read(ui::OSExchangeData(CloneProvider(data)))); EXPECT_FALSE(drag_data.is_valid()); } @@ -56,11 +56,11 @@ TEST_F(BookmarkNodeDataTest, JustURL) { const GURL url("http://google.com"); const std::wstring title(L"title"); - OSExchangeData data; + ui::OSExchangeData data; data.SetURL(url, title); BookmarkNodeData drag_data; - EXPECT_TRUE(drag_data.Read(OSExchangeData(CloneProvider(data)))); + EXPECT_TRUE(drag_data.Read(ui::OSExchangeData(CloneProvider(data)))); EXPECT_TRUE(drag_data.is_valid()); ASSERT_EQ(1, drag_data.elements.size()); EXPECT_TRUE(drag_data.elements[0].is_url); @@ -86,11 +86,11 @@ TEST_F(BookmarkNodeDataTest, URL) { EXPECT_TRUE(drag_data.elements[0].is_url); EXPECT_EQ(url, drag_data.elements[0].url); EXPECT_EQ(title, WideToUTF16Hack(drag_data.elements[0].title)); - OSExchangeData data; + ui::OSExchangeData data; drag_data.Write(&profile, &data); // Now read the data back in. - OSExchangeData data2(CloneProvider(data)); + ui::OSExchangeData data2(CloneProvider(data)); BookmarkNodeData read_data; EXPECT_TRUE(read_data.Read(data2)); EXPECT_TRUE(read_data.is_valid()); @@ -130,11 +130,11 @@ TEST_F(BookmarkNodeDataTest, Group) { EXPECT_EQ(g12->GetTitle(), WideToUTF16Hack(drag_data.elements[0].title)); EXPECT_FALSE(drag_data.elements[0].is_url); - OSExchangeData data; + ui::OSExchangeData data; drag_data.Write(&profile, &data); // Now read the data back in. - OSExchangeData data2(CloneProvider(data)); + ui::OSExchangeData data2(CloneProvider(data)); BookmarkNodeData read_data; EXPECT_TRUE(read_data.Read(data2)); EXPECT_TRUE(read_data.is_valid()); @@ -168,11 +168,11 @@ TEST_F(BookmarkNodeDataTest, GroupWithChild) { BookmarkNodeData drag_data(group); - OSExchangeData data; + ui::OSExchangeData data; drag_data.Write(&profile, &data); // Now read the data back in. - OSExchangeData data2(CloneProvider(data)); + ui::OSExchangeData data2(CloneProvider(data)); BookmarkNodeData read_data; EXPECT_TRUE(read_data.Read(data2)); ASSERT_EQ(1, read_data.elements.size()); @@ -210,11 +210,11 @@ TEST_F(BookmarkNodeDataTest, MultipleNodes) { nodes.push_back(group); nodes.push_back(url_node); BookmarkNodeData drag_data(nodes); - OSExchangeData data; + ui::OSExchangeData data; drag_data.Write(&profile, &data); // Read the data back in. - OSExchangeData data2(CloneProvider(data)); + ui::OSExchangeData data2(CloneProvider(data)); BookmarkNodeData read_data; EXPECT_TRUE(read_data.Read(data2)); EXPECT_TRUE(read_data.is_valid()); diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 55acbbe..848215a 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -38,7 +38,7 @@ #include "views/event.h" #if defined(TOOLKIT_VIEWS) -#include "app/os_exchange_data.h" +#include "ui/base/dragdrop/os_exchange_data.h" #include "views/drag_utils.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" @@ -325,7 +325,7 @@ void DragBookmarks(Profile* profile, #if defined(TOOLKIT_VIEWS) // Set up our OLE machinery - OSExchangeData data; + ui::OSExchangeData data; BookmarkNodeData drag_data(nodes); drag_data.Write(profile, &data); diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 97f02b7..a7f6118 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -56,7 +56,7 @@ #include "third_party/skia/include/core/SkShader.h" #if defined(TOOLKIT_VIEWS) -#include "app/os_exchange_data.h" +#include "ui/base/dragdrop/os_exchange_data.h" #include "views/drag_utils.h" #endif @@ -70,12 +70,12 @@ #endif // defined(TOOLKIT_USES_GTK) #if defined(OS_WIN) -#include "app/os_exchange_data_provider_win.h" #include "app/win/drag_source.h" #include "app/win/win_util.h" #include "base/win/scoped_comptr.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "ui/base/dragdrop/os_exchange_data_provider_win.h" #endif namespace download_util { @@ -469,7 +469,7 @@ void DragDownload(const DownloadItem* download, DCHECK(download); // Set up our OLE machinery - OSExchangeData data; + ui::OSExchangeData data; if (icon) { drag_utils::CreateDragImageForFile( @@ -494,8 +494,8 @@ void DragDownload(const DownloadItem* download, // Run the drag and drop loop DWORD effects; - DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source.get(), - DROPEFFECT_COPY | DROPEFFECT_LINK, &effects); + DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data), + drag_source.get(), DROPEFFECT_COPY | DROPEFFECT_LINK, &effects); #elif defined(TOOLKIT_USES_GTK) GtkWidget* root = gtk_widget_get_toplevel(view); if (!root) diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h index a626030..088ef1d 100644 --- a/chrome/browser/renderer_host/render_view_host_delegate.h +++ b/chrome/browser/renderer_host/render_view_host_delegate.h @@ -35,7 +35,6 @@ class GURL; class ListValue; struct NativeWebKeyboardEvent; class NavigationEntry; -class OSExchangeData; class Profile; struct RendererPreferences; class RenderProcessHost; diff --git a/chrome/browser/tab_contents/web_drop_target_win.cc b/chrome/browser/tab_contents/web_drop_target_win.cc index d358fe3..d0b8525 100644 --- a/chrome/browser/tab_contents/web_drop_target_win.cc +++ b/chrome/browser/tab_contents/web_drop_target_win.cc @@ -7,8 +7,6 @@ #include <windows.h> #include <shlobj.h> -#include "app/os_exchange_data.h" -#include "app/os_exchange_data_provider_win.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -17,6 +15,8 @@ #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "ui/base/clipboard/clipboard_util_win.h" +#include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/window_open_disposition.h" @@ -110,7 +110,7 @@ DWORD WebDropTarget::OnDragEnter(IDataObject* data_object, WebDropData::PopulateWebDropData(data_object, &drop_data); if (drop_data.url.is_empty()) - OSExchangeDataProviderWin::GetPlainTextURL(data_object, &drop_data.url); + ui::OSExchangeDataProviderWin::GetPlainTextURL(data_object, &drop_data.url); drag_cursor_ = WebDragOperationNone; @@ -124,7 +124,8 @@ DWORD WebDropTarget::OnDragEnter(IDataObject* data_object, // This is non-null if tab_contents_ is showing an ExtensionDOMUI with // support for (at the moment experimental) drag and drop extensions. if (tab_contents_->GetBookmarkDragDelegate()) { - OSExchangeData os_exchange_data(new OSExchangeDataProviderWin(data_object)); + ui::OSExchangeData os_exchange_data( + new ui::OSExchangeDataProviderWin(data_object)); BookmarkNodeData bookmark_drag_data; if (bookmark_drag_data.Read(os_exchange_data)) tab_contents_->GetBookmarkDragDelegate()->OnDragEnter(bookmark_drag_data); @@ -154,7 +155,8 @@ DWORD WebDropTarget::OnDragOver(IDataObject* data_object, web_drag_utils_win::WinDragOpMaskToWebDragOpMask(effects)); if (tab_contents_->GetBookmarkDragDelegate()) { - OSExchangeData os_exchange_data(new OSExchangeDataProviderWin(data_object)); + ui::OSExchangeData os_exchange_data( + new ui::OSExchangeDataProviderWin(data_object)); BookmarkNodeData bookmark_drag_data; if (bookmark_drag_data.Read(os_exchange_data)) tab_contents_->GetBookmarkDragDelegate()->OnDragOver(bookmark_drag_data); @@ -175,7 +177,8 @@ void WebDropTarget::OnDragLeave(IDataObject* data_object) { } if (tab_contents_->GetBookmarkDragDelegate()) { - OSExchangeData os_exchange_data(new OSExchangeDataProviderWin(data_object)); + ui::OSExchangeData os_exchange_data( + new ui::OSExchangeDataProviderWin(data_object)); BookmarkNodeData bookmark_drag_data; if (bookmark_drag_data.Read(os_exchange_data)) tab_contents_->GetBookmarkDragDelegate()->OnDragLeave(bookmark_drag_data); @@ -203,7 +206,8 @@ DWORD WebDropTarget::OnDrop(IDataObject* data_object, gfx::Point(cursor_position.x, cursor_position.y)); if (tab_contents_->GetBookmarkDragDelegate()) { - OSExchangeData os_exchange_data(new OSExchangeDataProviderWin(data_object)); + ui::OSExchangeData os_exchange_data( + new ui::OSExchangeDataProviderWin(data_object)); BookmarkNodeData bookmark_drag_data; if (bookmark_drag_data.Read(os_exchange_data)) tab_contents_->GetBookmarkDragDelegate()->OnDrop(bookmark_drag_data); diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmark_bar_view.cc index fa1e444..0631169 100644 --- a/chrome/browser/ui/views/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmark_bar_view.cc @@ -10,7 +10,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "app/text_elider.h" #include "base/i18n/rtl.h" @@ -43,6 +42,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/dragdrop/os_exchange_data.h" #include "views/controls/button/menu_button.h" #include "views/controls/label.h" #include "views/controls/menu/menu_item_view.h" @@ -563,10 +563,10 @@ void BookmarkBarView::PaintChildren(gfx::Canvas* canvas) { bool BookmarkBarView::GetDropFormats( int* formats, - std::set<OSExchangeData::CustomFormat>* custom_formats) { + std::set<ui::OSExchangeData::CustomFormat>* custom_formats) { if (!model_ || !model_->IsLoaded()) return false; - *formats = OSExchangeData::URL; + *formats = ui::OSExchangeData::URL; custom_formats->insert(BookmarkNodeData::GetBookmarkCustomFormat()); return true; } @@ -575,7 +575,7 @@ bool BookmarkBarView::AreDropTypesRequired() { return true; } -bool BookmarkBarView::CanDrop(const OSExchangeData& data) { +bool BookmarkBarView::CanDrop(const ui::OSExchangeData& data) { if (!model_ || !model_->IsLoaded()) return false; @@ -1109,7 +1109,7 @@ void BookmarkBarView::BookmarkNodeFavIconLoaded(BookmarkModel* model, void BookmarkBarView::WriteDragData(View* sender, const gfx::Point& press_pt, - OSExchangeData* data) { + ui::OSExchangeData* data) { UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_DragButton"), profile_); @@ -1172,7 +1172,7 @@ bool BookmarkBarView::CanStartDrag(views::View* sender, } void BookmarkBarView::WriteDragData(const BookmarkNode* node, - OSExchangeData* data) { + ui::OSExchangeData* data) { DCHECK(node && data); BookmarkNodeData drag_data(node); drag_data.Write(profile_, data); diff --git a/chrome/browser/ui/views/bookmark_bar_view.h b/chrome/browser/ui/views/bookmark_bar_view.h index 1687c2e..49cec21 100644 --- a/chrome/browser/ui/views/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmark_bar_view.h @@ -127,9 +127,9 @@ class BookmarkBarView : public DetachableToolbarView, virtual void PaintChildren(gfx::Canvas* canvas); virtual bool GetDropFormats( int* formats, - std::set<OSExchangeData::CustomFormat>* custom_formats); + std::set<ui::OSExchangeData::CustomFormat>* custom_formats); virtual bool AreDropTypesRequired(); - virtual bool CanDrop(const OSExchangeData& data); + virtual bool CanDrop(const ui::OSExchangeData& data); virtual void OnDragEntered(const views::DropTargetEvent& event); virtual int OnDragUpdated(const views::DropTargetEvent& event); virtual void OnDragExited(); @@ -347,7 +347,7 @@ class BookmarkBarView : public DetachableToolbarView, // WriteDragData to write the actual data. virtual void WriteDragData(views::View* sender, const gfx::Point& press_pt, - OSExchangeData* data); + ui::OSExchangeData* data); virtual int GetDragOperations(views::View* sender, const gfx::Point& p); @@ -356,7 +356,7 @@ class BookmarkBarView : public DetachableToolbarView, const gfx::Point& p); // Writes a BookmarkNodeData for node to data. - void WriteDragData(const BookmarkNode* node, OSExchangeData* data); + void WriteDragData(const BookmarkNode* node, ui::OSExchangeData* data); // ViewMenuDelegate method. Ends up creating a BookmarkMenuController to // show the menu. diff --git a/chrome/browser/ui/views/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmark_menu_controller_views.cc index fd20ec6..6f761d0 100644 --- a/chrome/browser/ui/views/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmark_menu_controller_views.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/bookmark_menu_controller_views.h" -#include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" @@ -20,6 +19,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/dragdrop/os_exchange_data.h" #include "views/controls/button/menu_button.h" using views::MenuItemView; @@ -107,8 +107,8 @@ void BookmarkMenuController::ExecuteCommand(int id, int mouse_event_flags) { bool BookmarkMenuController::GetDropFormats( MenuItemView* menu, int* formats, - std::set<OSExchangeData::CustomFormat>* custom_formats) { - *formats = OSExchangeData::URL; + std::set<ui::OSExchangeData::CustomFormat>* custom_formats) { + *formats = ui::OSExchangeData::URL; custom_formats->insert(BookmarkNodeData::GetBookmarkCustomFormat()); return true; } @@ -118,7 +118,7 @@ bool BookmarkMenuController::AreDropTypesRequired(MenuItemView* menu) { } bool BookmarkMenuController::CanDrop(MenuItemView* menu, - const OSExchangeData& data) { + const ui::OSExchangeData& data) { // Only accept drops of 1 node, which is the case for all data dragged from // bookmark bar and menus. @@ -218,7 +218,7 @@ bool BookmarkMenuController::CanDrag(MenuItemView* menu) { } void BookmarkMenuController::WriteDragData(MenuItemView* sender, - OSExchangeData* data) { + ui::OSExchangeData* data) { DCHECK(sender && data); UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_DragFromFolder"), diff --git a/chrome/browser/ui/views/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmark_menu_controller_views.h index a468266..9efb847 100644 --- a/chrome/browser/ui/views/bookmark_menu_controller_views.h +++ b/chrome/browser/ui/views/bookmark_menu_controller_views.h @@ -16,22 +16,25 @@ #include "views/controls/menu/menu_delegate.h" #include "views/controls/menu/menu_item_view.h" +class BookmarkBarView; +class BookmarkContextMenu; +class BookmarkNode; +class Browser; +class PageNavigator; +class Profile; + namespace gfx { class Rect; } // namespace gfx +namespace ui { +class OSExchangeData; +} // namespace ui + namespace views { class MenuButton; } // namespace views -class BookmarkBarView; -class BookmarkContextMenu; -class BookmarkNode; -class Browser; -class OSExchangeData; -class PageNavigator; -class Profile; - // BookmarkMenuController is responsible for showing a menu of bookmarks, // each item in the menu represents a bookmark. // BookmarkMenuController deletes itself as necessary, although the menu can @@ -87,9 +90,10 @@ class BookmarkMenuController : public BaseBookmarkModelObserver, virtual bool GetDropFormats( views::MenuItemView* menu, int* formats, - std::set<OSExchangeData::CustomFormat>* custom_formats); + std::set<ui::OSExchangeData::CustomFormat>* custom_formats); virtual bool AreDropTypesRequired(views::MenuItemView* menu); - virtual bool CanDrop(views::MenuItemView* menu, const OSExchangeData& data); + virtual bool CanDrop(views::MenuItemView* menu, + const ui::OSExchangeData& data); virtual int GetDropOperation(views::MenuItemView* item, const views::DropTargetEvent& event, DropPosition* position); @@ -102,7 +106,8 @@ class BookmarkMenuController : public BaseBookmarkModelObserver, bool is_mouse_gesture); virtual void DropMenuClosed(views::MenuItemView* menu); virtual bool CanDrag(views::MenuItemView* menu); - virtual void WriteDragData(views::MenuItemView* sender, OSExchangeData* data); + virtual void WriteDragData(views::MenuItemView* sender, + ui::OSExchangeData* data); virtual int GetDragOperations(views::MenuItemView* sender); virtual views::MenuItemView* GetSiblingMenu( views::MenuItemView* menu, diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h index 235bede..4bce4b5 100644 --- a/chrome/browser/ui/views/browser_actions_container.h +++ b/chrome/browser/ui/views/browser_actions_container.h @@ -323,9 +323,9 @@ class BrowserActionsContainer views::View* parent, views::View* child); virtual bool GetDropFormats( - int* formats, std::set<OSExchangeData::CustomFormat>* custom_formats); + int* formats, std::set<ui::OSExchangeData::CustomFormat>* custom_formats); virtual bool AreDropTypesRequired(); - virtual bool CanDrop(const OSExchangeData& data); + virtual bool CanDrop(const ui::OSExchangeData& data); virtual void OnDragEntered(const views::DropTargetEvent& event); virtual int OnDragUpdated(const views::DropTargetEvent& event); virtual void OnDragExited(); @@ -339,7 +339,7 @@ class BrowserActionsContainer // Overridden from views::DragController: virtual void WriteDragData(View* sender, const gfx::Point& press_pt, - OSExchangeData* data); + ui::OSExchangeData* data); virtual int GetDragOperations(View* sender, const gfx::Point& p); virtual bool CanStartDrag(View* sender, const gfx::Point& press_pt, diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc index 0be07f3..a520ebc 100644 --- a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc @@ -27,14 +27,14 @@ bool BrowserActionDragData::IsFromProfile(Profile* profile) const { #if defined(TOOLKIT_VIEWS) void BrowserActionDragData::Write( - Profile* profile, OSExchangeData* data) const { + Profile* profile, ui::OSExchangeData* data) const { DCHECK(data); Pickle data_pickle; WriteToPickle(profile, &data_pickle); data->SetPickledData(GetBrowserActionCustomFormat(), data_pickle); } -bool BrowserActionDragData::Read(const OSExchangeData& data) { +bool BrowserActionDragData::Read(const ui::OSExchangeData& data) { if (!data.HasCustomFormat(GetBrowserActionCustomFormat())) return false; @@ -49,14 +49,14 @@ bool BrowserActionDragData::Read(const OSExchangeData& data) { } // static -OSExchangeData::CustomFormat +ui::OSExchangeData::CustomFormat BrowserActionDragData::GetBrowserActionCustomFormat() { - static OSExchangeData::CustomFormat format; + static ui::OSExchangeData::CustomFormat format; static bool format_valid = false; if (!format_valid) { format_valid = true; - format = OSExchangeData::RegisterCustomFormat( + format = ui::OSExchangeData::RegisterCustomFormat( BrowserActionDragData::kClipboardFormatString); } return format; diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data.h b/chrome/browser/ui/views/extensions/browser_action_drag_data.h index 7168025..ee729b3 100644 --- a/chrome/browser/ui/views/extensions/browser_action_drag_data.h +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data.h @@ -12,7 +12,7 @@ #include "chrome/browser/profiles/profile.h" #if defined(TOOLKIT_VIEWS) -#include "app/os_exchange_data.h" +#include "ui/base/dragdrop/os_exchange_data.h" #endif class BrowserActionButton; @@ -32,13 +32,13 @@ class BrowserActionDragData { bool IsFromProfile(Profile* profile) const; #if defined(TOOLKIT_VIEWS) - void Write(Profile* profile, OSExchangeData* data) const; + void Write(Profile* profile, ui::OSExchangeData* data) const; // Restores this data from the clipboard, returning true on success. - bool Read(const OSExchangeData& data); + bool Read(const ui::OSExchangeData& data); // Returns the Custom Format this class supports (for Browser Actions). - static OSExchangeData::CustomFormat GetBrowserActionCustomFormat(); + static ui::OSExchangeData::CustomFormat GetBrowserActionCustomFormat(); #endif private: diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc b/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc index 370796c..0774caf 100644 --- a/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/os_exchange_data.h" -#include "app/os_exchange_data_provider_win.h" #include "base/pickle.h" #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" #include "chrome/test/testing_profile.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/dragdrop/os_exchange_data_provider_win.h" namespace { -OSExchangeData::Provider* CloneProvider(const OSExchangeData& data) { - return new OSExchangeDataProviderWin( - OSExchangeDataProviderWin::GetIDataObject(data)); +ui::OSExchangeData::Provider* CloneProvider(const ui::OSExchangeData& data) { + return new ui::OSExchangeDataProviderWin( + ui::OSExchangeDataProviderWin::GetIDataObject(data)); } } // namespace @@ -25,12 +25,12 @@ TEST_F(BrowserActionDragDataTest, ArbitraryFormat) { TestingProfile profile; profile.SetID(L"id"); - OSExchangeData data; + ui::OSExchangeData data; data.SetURL(GURL("http://www.google.com"), L"Title"); // We only support our format, so this should not succeed. BrowserActionDragData drag_data; - EXPECT_FALSE(drag_data.Read(OSExchangeData(CloneProvider(data)))); + EXPECT_FALSE(drag_data.Read(ui::OSExchangeData(CloneProvider(data)))); } TEST_F(BrowserActionDragDataTest, BrowserActionDragDataFormat) { @@ -44,12 +44,12 @@ TEST_F(BrowserActionDragDataTest, BrowserActionDragDataFormat) { pickle.WriteString(extension_id); pickle.WriteInt(42); - OSExchangeData data; + ui::OSExchangeData data; data.SetPickledData(BrowserActionDragData::GetBrowserActionCustomFormat(), pickle); BrowserActionDragData drag_data; - EXPECT_TRUE(drag_data.Read(OSExchangeData(CloneProvider(data)))); + EXPECT_TRUE(drag_data.Read(ui::OSExchangeData(CloneProvider(data)))); ASSERT_TRUE(drag_data.IsFromProfile(profile.GetOriginalProfile())); ASSERT_STREQ(extension_id.c_str(), drag_data.id().c_str()); ASSERT_EQ(42, drag_data.index()); diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h index 06f8823..7d0fa1e 100644 --- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h +++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h @@ -58,9 +58,9 @@ class BrowserActionOverflowMenuController : public views::MenuDelegate { virtual bool GetDropFormats( views::MenuItemView* menu, int* formats, - std::set<OSExchangeData::CustomFormat>* custom_formats); + std::set<ui::OSExchangeData::CustomFormat>* custom_formats); virtual bool AreDropTypesRequired(views::MenuItemView* menu); - virtual bool CanDrop(views::MenuItemView* menu, const OSExchangeData& data); + virtual bool CanDrop(views::MenuItemView* menu, const ui::OSExchangeData& data); virtual int GetDropOperation(views::MenuItemView* item, const views::DropTargetEvent& event, DropPosition* position); @@ -70,7 +70,7 @@ class BrowserActionOverflowMenuController : public views::MenuDelegate { // These three drag functions offer support for dragging icons out of the // overflow menu. virtual bool CanDrag(views::MenuItemView* menu); - virtual void WriteDragData(views::MenuItemView* sender, OSExchangeData* data); + virtual void WriteDragData(views::MenuItemView* sender, ui::OSExchangeData* data); virtual int GetDragOperations(views::MenuItemView* sender); private: diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc index 94c2b47..97d1a45 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc @@ -6,7 +6,6 @@ #include "app/drag_drop_types.h" #include "app/l10n_util.h" -#include "app/os_exchange_data.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" @@ -17,6 +16,7 @@ #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "grit/chromium_strings.h" +#include "ui/base/dragdrop/os_exchange_data.h" BrowserRootView::BrowserRootView(BrowserView* browser_view, views::Widget* widget) @@ -28,9 +28,9 @@ BrowserRootView::BrowserRootView(BrowserView* browser_view, bool BrowserRootView::GetDropFormats( int* formats, - std::set<OSExchangeData::CustomFormat>* custom_formats) { + std::set<ui::OSExchangeData::CustomFormat>* custom_formats) { if (tabstrip() && tabstrip()->IsVisible() && !tabstrip()->IsAnimating()) { - *formats = OSExchangeData::URL | OSExchangeData::STRING; + *formats = ui::OSExchangeData::URL | ui::OSExchangeData::STRING; return true; } return false; @@ -40,7 +40,7 @@ bool BrowserRootView::AreDropTypesRequired() { return true; } -bool BrowserRootView::CanDrop(const OSExchangeData& data) { +bool BrowserRootView::CanDrop(const ui::OSExchangeData& data) { if (!tabstrip() || !tabstrip()->IsVisible() || tabstrip()->IsAnimating()) return false; @@ -88,19 +88,19 @@ int BrowserRootView::OnPerformDrop(const views::DropTargetEvent& event) { if (!forwarding_to_tab_strip_) return DragDropTypes::DRAG_NONE; - // Extract the URL and create a new OSExchangeData containing the URL. We do - // this as the TabStrip doesn't know about the autocomplete edit and neeeds + // Extract the URL and create a new ui::OSExchangeData containing the URL. We + // do this as the TabStrip doesn't know about the autocomplete edit and needs // to know about it to handle 'paste and go'. GURL url; std::wstring title; - OSExchangeData mapped_data; + ui::OSExchangeData mapped_data; if (!event.GetData().GetURLAndTitle(&url, &title) || !url.is_valid()) { // The url isn't valid. Use the paste and go url. if (GetPasteAndGoURL(event.GetData(), &url)) mapped_data.SetURL(url, std::wstring()); // else case: couldn't extract a url or 'paste and go' url. This ends up - // passing through an OSExchangeData with nothing in it. We need to do this - // so that the tab strip cleans up properly. + // passing through an ui::OSExchangeData with nothing in it. We need to do + // this so that the tab strip cleans up properly. } else { mapped_data.SetURL(url, std::wstring()); } @@ -124,7 +124,7 @@ bool BrowserRootView::ShouldForwardToTabStrip( views::DropTargetEvent* BrowserRootView::MapEventToTabStrip( const views::DropTargetEvent& event, - const OSExchangeData& data) { + const ui::OSExchangeData& data) { gfx::Point tab_strip_loc(event.location()); ConvertPointToView(this, tabstrip(), &tab_strip_loc); return new views::DropTargetEvent(data, tab_strip_loc.x(), @@ -136,7 +136,8 @@ BaseTabStrip* BrowserRootView::tabstrip() const { return browser_view_->tabstrip(); } -bool BrowserRootView::GetPasteAndGoURL(const OSExchangeData& data, GURL* url) { +bool BrowserRootView::GetPasteAndGoURL(const ui::OSExchangeData& data, + GURL* url) { if (!data.HasString()) return false; diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc index f4d3f9d..64265e0 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc @@ -182,7 +182,7 @@ void TabContentsDragWin::StartBackgroundDragging( void TabContentsDragWin::PrepareDragForDownload( const WebDropData& drop_data, - OSExchangeData* data, + ui::OSExchangeData* data, const GURL& page_url, const std::string& page_encoding) { // Parse the download metadata. @@ -215,16 +215,16 @@ void TabContentsDragWin::PrepareDragForDownload( page_url, page_encoding, view_->tab_contents()); - OSExchangeData::DownloadFileInfo file_download(FilePath(), - download_file.get()); + ui::OSExchangeData::DownloadFileInfo file_download(FilePath(), + download_file.get()); data->SetDownloadFileInfo(file_download); // Enable asynchronous operation. - OSExchangeDataProviderWin::GetIAsyncOperation(*data)->SetAsyncMode(TRUE); + ui::OSExchangeDataProviderWin::GetIAsyncOperation(*data)->SetAsyncMode(TRUE); } void TabContentsDragWin::PrepareDragForFileContents( - const WebDropData& drop_data, OSExchangeData* data) { + const WebDropData& drop_data, ui::OSExchangeData* data) { // Images without ALT text will only have a file extension so we need to // synthesize one from the provided extension and URL. FilePath file_name(drop_data.file_description_filename); @@ -243,7 +243,7 @@ void TabContentsDragWin::PrepareDragForFileContents( } void TabContentsDragWin::PrepareDragForUrl(const WebDropData& drop_data, - OSExchangeData* data) { + ui::OSExchangeData* data) { if (drop_data.url.SchemeIs(chrome::kJavaScriptScheme)) { // We don't want to allow javascript URLs to be dragged to the desktop, // but we do want to allow them to be added to the bookmarks bar @@ -271,13 +271,13 @@ void TabContentsDragWin::DoDragging(const WebDropData& drop_data, const std::string& page_encoding, const SkBitmap& image, const gfx::Point& image_offset) { - OSExchangeData data; + ui::OSExchangeData data; if (!drop_data.download_metadata.empty()) { PrepareDragForDownload(drop_data, &data, page_url, page_encoding); // Set the observer. - OSExchangeDataProviderWin::GetDataObjectImpl(data)->set_observer(this); + ui::OSExchangeDataProviderWin::GetDataObjectImpl(data)->set_observer(this); } else { // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over @@ -305,7 +305,7 @@ void TabContentsDragWin::DoDragging(const WebDropData& drop_data, bool old_state = MessageLoop::current()->NestableTasksAllowed(); MessageLoop::current()->SetNestableTasksAllowed(true); DWORD effect; - DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source_, + DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data), drag_source_, web_drag_utils_win::WebDragOpMaskToWinDragOpMask(ops), &effect); MessageLoop::current()->SetNestableTasksAllowed(old_state); diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h index 7e2b7c8..e05ab68 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h @@ -6,13 +6,13 @@ #define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_DRAG_WIN_H_ #pragma once -#include "app/os_exchange_data_provider_win.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/threading/platform_thread.h" #include "gfx/point.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" +#include "ui/base/dragdrop/os_exchange_data_provider_win.h" class DragDropThread; class TabContentsViewWin; @@ -25,7 +25,7 @@ struct WebDropData; // message loop in the UI thread. For all other cases, the drag-and-drop happens // in the UI thread. class TabContentsDragWin - : public DataObjectImpl::Observer, + : public ui::DataObjectImpl::Observer, public base::RefCountedThreadSafe<TabContentsDragWin> { public: explicit TabContentsDragWin(TabContentsViewWin* view); @@ -46,12 +46,13 @@ class TabContentsDragWin private: // Called on either UI thread or drag-and-drop thread. void PrepareDragForDownload(const WebDropData& drop_data, - OSExchangeData* data, + ui::OSExchangeData* data, const GURL& page_url, const std::string& page_encoding); void PrepareDragForFileContents(const WebDropData& drop_data, - OSExchangeData* data); - void PrepareDragForUrl(const WebDropData& drop_data, OSExchangeData* data); + ui::OSExchangeData* data); + void PrepareDragForUrl(const WebDropData& drop_data, + ui::OSExchangeData* data); void DoDragging(const WebDropData& drop_data, WebKit::WebDragOperationsMask ops, const GURL& page_url, diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 06be2e9..b6104ed 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1624,7 +1624,6 @@ '../third_party/qcms/qcms.gyp:*', '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', - '../ui/ui.gyp:*', '../webkit/support/webkit_support.gyp:*', '../webkit/webkit.gyp:*', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 8b174b7..3fc5841 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -40,7 +40,6 @@ '../third_party/npapi/npapi.gyp:npapi', '../third_party/hunspell/hunspell.gyp:hunspell', '../third_party/speex/speex.gyp:libspeex', - '../ui/ui.gyp:ui_base', '../webkit/support/webkit_support.gyp:appcache', '../webkit/support/webkit_support.gyp:blob', '../webkit/support/webkit_support.gyp:database', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 163162f..54572cf 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1004,7 +1004,6 @@ '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', - '../ui/ui.gyp:ui_base', ], 'include_dirs': [ '..', |