Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Side by Side Diff: chrome/browser/tab_contents/web_drag_bookmark_handler_win.cc

Issue 10831308: Revert 151036 - Speculative revert to see if this change introduced a performance regression on Mac… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_win.h" 5 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_win.h"
6 6
7 #include "chrome/browser/bookmarks/bookmark_node_data.h" 7 #include "chrome/browser/bookmarks/bookmark_node_data.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
10 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 ui::OSExchangeData os_exchange_data( 68 ui::OSExchangeData os_exchange_data(
69 new ui::OSExchangeDataProviderWin(data_object)); 69 new ui::OSExchangeDataProviderWin(data_object));
70 BookmarkNodeData bookmark_drag_data; 70 BookmarkNodeData bookmark_drag_data;
71 if (bookmark_drag_data.Read(os_exchange_data)) { 71 if (bookmark_drag_data.Read(os_exchange_data)) {
72 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDrop( 72 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDrop(
73 bookmark_drag_data); 73 bookmark_drag_data);
74 } 74 }
75 } 75 }
76 76
77 // Focus the target browser. 77 // Focus the target browser.
78 Browser* browser = browser::FindBrowserForController( 78 Browser* browser = browser::FindBrowserWithWebContents(
79 &tab_->web_contents()->GetController(), NULL); 79 tab_->web_contents());
80 if (browser) 80 if (browser)
81 browser->window()->Show(); 81 browser->window()->Show();
82 } 82 }
83 } 83 }
84 84
85 void WebDragBookmarkHandlerWin::OnDragLeave(IDataObject* data_object) { 85 void WebDragBookmarkHandlerWin::OnDragLeave(IDataObject* data_object) {
86 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { 86 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
87 ui::OSExchangeData os_exchange_data( 87 ui::OSExchangeData os_exchange_data(
88 new ui::OSExchangeDataProviderWin(data_object)); 88 new ui::OSExchangeDataProviderWin(data_object));
89 BookmarkNodeData bookmark_drag_data; 89 BookmarkNodeData bookmark_drag_data;
(...skipping 19 matching lines...) Expand all
109 109
110 BookmarkNodeData bm_drag_data; 110 BookmarkNodeData bm_drag_data;
111 bm_drag_data.elements.push_back(bm_elt); 111 bm_drag_data.elements.push_back(bm_elt);
112 112
113 // Pass in NULL as the profile so that the bookmark always adds the url 113 // Pass in NULL as the profile so that the bookmark always adds the url
114 // rather than trying to move an existing url. 114 // rather than trying to move an existing url.
115 bm_drag_data.Write(NULL, data); 115 bm_drag_data.Write(NULL, data);
116 116
117 return true; 117 return true;
118 } 118 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698