diff options
author | dcheng <dcheng@chromium.org> | 2014-11-12 16:48:56 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-13 00:49:52 +0000 |
commit | db3aefa5b23c8849848c3cdc817e46d666a1836c (patch) | |
tree | 548bff43524b903c302cc7521b4ee9cfdf64be12 /ui/base/dragdrop | |
parent | 8c6ae495cf2dd5117d0d209c25169710c491f992 (diff) | |
download | chromium_src-db3aefa5b23c8849848c3cdc817e46d666a1836c.zip chromium_src-db3aefa5b23c8849848c3cdc817e46d666a1836c.tar.gz chromium_src-db3aefa5b23c8849848c3cdc817e46d666a1836c.tar.bz2 |
Remove implicit conversions from scoped_refptr to T* in ui/
This patch was generated by running the rewrite_scoped_refptr clang tool
on a Windows build.
BUG=110610
Review URL: https://codereview.chromium.org/721983002
Cr-Commit-Position: refs/heads/master@{#303941}
Diffstat (limited to 'ui/base/dragdrop')
-rw-r--r-- | ui/base/dragdrop/drop_target_win.cc | 12 | ||||
-rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_win.cc | 29 |
2 files changed, 21 insertions, 20 deletions
diff --git a/ui/base/dragdrop/drop_target_win.cc b/ui/base/dragdrop/drop_target_win.cc index 078a14e..0370e2b 100644 --- a/ui/base/dragdrop/drop_target_win.cc +++ b/ui/base/dragdrop/drop_target_win.cc @@ -49,7 +49,8 @@ HRESULT DropTargetWin::DragEnter(IDataObject* data_object, current_data_object_ = data_object; POINT screen_pt = { cursor_position.x, cursor_position.y }; - *effect = OnDragEnter(current_data_object_, key_state, screen_pt, *effect); + *effect = + OnDragEnter(current_data_object_.get(), key_state, screen_pt, *effect); return S_OK; } @@ -62,7 +63,8 @@ HRESULT DropTargetWin::DragOver(DWORD key_state, drop_helper->DragOver(reinterpret_cast<POINT*>(&cursor_position), *effect); POINT screen_pt = { cursor_position.x, cursor_position.y }; - *effect = OnDragOver(current_data_object_, key_state, screen_pt, *effect); + *effect = + OnDragOver(current_data_object_.get(), key_state, screen_pt, *effect); return S_OK; } @@ -72,7 +74,7 @@ HRESULT DropTargetWin::DragLeave() { if (drop_helper) drop_helper->DragLeave(); - OnDragLeave(current_data_object_); + OnDragLeave(current_data_object_.get()); current_data_object_ = NULL; return S_OK; @@ -85,12 +87,12 @@ HRESULT DropTargetWin::Drop(IDataObject* data_object, // Tell the helper that we dropped onto it so it can update the drag image. IDropTargetHelper* drop_helper = DropHelper(); if (drop_helper) { - drop_helper->Drop(current_data_object_, + drop_helper->Drop(current_data_object_.get(), reinterpret_cast<POINT*>(&cursor_position), *effect); } POINT screen_pt = { cursor_position.x, cursor_position.y }; - *effect = OnDrop(current_data_object_, key_state, screen_pt, *effect); + *effect = OnDrop(current_data_object_.get(), key_state, screen_pt, *effect); return S_OK; } diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc index d283394..3b614bc 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc @@ -401,7 +401,7 @@ void OSExchangeDataProviderWin::SetHtml(const base::string16& html, } bool OSExchangeDataProviderWin::GetString(base::string16* data) const { - return ClipboardUtil::GetPlainText(source_object_, data); + return ClipboardUtil::GetPlainText(source_object_.get(), data); } bool OSExchangeDataProviderWin::GetURLAndTitle( @@ -410,14 +410,12 @@ bool OSExchangeDataProviderWin::GetURLAndTitle( base::string16* title) const { base::string16 url_str; bool success = ClipboardUtil::GetUrl( - source_object_, - url, - title, + source_object_.get(), url, title, policy == OSExchangeData::CONVERT_FILENAMES ? true : false); if (success) { DCHECK(url->is_valid()); return true; - } else if (GetPlainTextURL(source_object_, url)) { + } else if (GetPlainTextURL(source_object_.get(), url)) { if (url->is_valid()) *title = net::GetSuggestedFilename(*url, "", "", "", "", std::string()); else @@ -429,7 +427,7 @@ bool OSExchangeDataProviderWin::GetURLAndTitle( bool OSExchangeDataProviderWin::GetFilename(base::FilePath* path) const { std::vector<base::string16> filenames; - bool success = ClipboardUtil::GetFilenames(source_object_, &filenames); + bool success = ClipboardUtil::GetFilenames(source_object_.get(), &filenames); if (success) *path = base::FilePath(filenames[0]); return success; @@ -438,7 +436,8 @@ bool OSExchangeDataProviderWin::GetFilename(base::FilePath* path) const { bool OSExchangeDataProviderWin::GetFilenames( std::vector<FileInfo>* filenames) const { std::vector<base::string16> filenames_local; - bool success = ClipboardUtil::GetFilenames(source_object_, &filenames_local); + bool success = + ClipboardUtil::GetFilenames(source_object_.get(), &filenames_local); if (success) { for (size_t i = 0; i < filenames_local.size(); ++i) filenames->push_back( @@ -470,7 +469,7 @@ bool OSExchangeDataProviderWin::GetFileContents( base::FilePath* filename, std::string* file_contents) const { base::string16 filename_str; - if (!ClipboardUtil::GetFileContents(source_object_, &filename_str, + if (!ClipboardUtil::GetFileContents(source_object_.get(), &filename_str, file_contents)) { return false; } @@ -481,34 +480,34 @@ bool OSExchangeDataProviderWin::GetFileContents( bool OSExchangeDataProviderWin::GetHtml(base::string16* html, GURL* base_url) const { std::string url; - bool success = ClipboardUtil::GetHtml(source_object_, html, &url); + bool success = ClipboardUtil::GetHtml(source_object_.get(), html, &url); if (success) *base_url = GURL(url); return success; } bool OSExchangeDataProviderWin::HasString() const { - return ClipboardUtil::HasPlainText(source_object_); + return ClipboardUtil::HasPlainText(source_object_.get()); } bool OSExchangeDataProviderWin::HasURL( OSExchangeData::FilenameToURLPolicy policy) const { return (ClipboardUtil::HasUrl( - source_object_, + source_object_.get(), policy == OSExchangeData::CONVERT_FILENAMES ? true : false) || - HasPlainTextURL(source_object_)); + HasPlainTextURL(source_object_.get())); } bool OSExchangeDataProviderWin::HasFile() const { - return ClipboardUtil::HasFilenames(source_object_); + return ClipboardUtil::HasFilenames(source_object_.get()); } bool OSExchangeDataProviderWin::HasFileContents() const { - return ClipboardUtil::HasFileContents(source_object_); + return ClipboardUtil::HasFileContents(source_object_.get()); } bool OSExchangeDataProviderWin::HasHtml() const { - return ClipboardUtil::HasHtml(source_object_); + return ClipboardUtil::HasHtml(source_object_.get()); } bool OSExchangeDataProviderWin::HasCustomFormat( |