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

Side by Side Diff: chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.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_gtk.h" 5 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_gtk.h"
6 6
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_finder.h" 8 #include "chrome/browser/ui/browser_finder.h"
9 #include "chrome/browser/ui/browser_window.h" 9 #include "chrome/browser/ui/browser_window.h"
10 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" 10 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 void WebDragBookmarkHandlerGtk::OnDrop() { 77 void WebDragBookmarkHandlerGtk::OnDrop() {
78 // This is non-null if tab_contents_ is showing an ExtensionWebUI with 78 // This is non-null if tab_contents_ is showing an ExtensionWebUI with
79 // support for (at the moment experimental) drag and drop extensions. 79 // support for (at the moment experimental) drag and drop extensions.
80 if (tab_) { 80 if (tab_) {
81 if (tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { 81 if (tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
82 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDrop( 82 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDrop(
83 bookmark_drag_data_); 83 bookmark_drag_data_);
84 } 84 }
85 85
86 // Focus the target browser. 86 // Focus the target browser.
87 Browser* browser = browser::FindBrowserForController( 87 Browser* browser = browser::FindBrowserWithWebContents(
88 &tab_->web_contents()->GetController(), NULL); 88 tab_->web_contents());
89 if (browser) 89 if (browser)
90 browser->window()->Show(); 90 browser->window()->Show();
91 } 91 }
92 } 92 }
93 93
94 void WebDragBookmarkHandlerGtk::OnDragLeave() { 94 void WebDragBookmarkHandlerGtk::OnDragLeave() {
95 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { 95 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
96 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave( 96 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave(
97 bookmark_drag_data_); 97 bookmark_drag_data_);
98 } 98 }
99 } 99 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698