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

Side by Side Diff: chrome/browser/tab_contents/web_drag_bookmark_handler_mac.mm

Issue 10391158: Moves methods for finding browsers to browser_finder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include fixs Created 8 years, 7 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) 2011 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_mac.h" 5 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_mac.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_window.h" 9 #include "chrome/browser/ui/browser_window.h"
9 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 10 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
10 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 11 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
11 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
12 13
13 using content::WebContents; 14 using content::WebContents;
14 15
15 WebDragBookmarkHandlerMac::WebDragBookmarkHandlerMac() 16 WebDragBookmarkHandlerMac::WebDragBookmarkHandlerMac()
16 : tab_(NULL) { 17 : tab_(NULL) {
17 } 18 }
(...skipping 25 matching lines...) Expand all
43 void WebDragBookmarkHandlerMac::OnDrop() { 44 void WebDragBookmarkHandlerMac::OnDrop() {
44 // This is non-null if tab_contents_ is showing an ExtensionWebUI with 45 // This is non-null if tab_contents_ is showing an ExtensionWebUI with
45 // support for (at the moment experimental) drag and drop extensions. 46 // support for (at the moment experimental) drag and drop extensions.
46 if (tab_) { 47 if (tab_) {
47 if (tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { 48 if (tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
48 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDrop( 49 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDrop(
49 bookmark_drag_data_); 50 bookmark_drag_data_);
50 } 51 }
51 52
52 // Focus the target browser. 53 // Focus the target browser.
53 Browser* browser = Browser::GetBrowserForController( 54 Browser* browser = browser::FindBrowserForController(
54 &tab_->web_contents()->GetController(), NULL); 55 &tab_->web_contents()->GetController(), NULL);
55 if (browser) 56 if (browser)
56 browser->window()->Show(); 57 browser->window()->Show();
57 } 58 }
58 } 59 }
59 60
60 void WebDragBookmarkHandlerMac::OnDragLeave() { 61 void WebDragBookmarkHandlerMac::OnDragLeave() {
61 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) { 62 if (tab_ && tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()) {
62 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave( 63 tab_->bookmark_tab_helper()->GetBookmarkDragDelegate()->OnDragLeave(
63 bookmark_drag_data_); 64 bookmark_drag_data_);
64 } 65 }
65 } 66 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698