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

Side by Side Diff: chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc

Issue 1158523002: Add user_gesture param to BaseWindow::Show Base URL: https://chromium.googlesource.com/chromium/src.git@ug3_BaseWindow_Activate
Patch Set: Update callers Created 5 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
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/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h" 5 #include "chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h"
6 6
7 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 7 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 if (bookmark_tab_helper_->bookmark_drag_delegate()) { 62 if (bookmark_tab_helper_->bookmark_drag_delegate()) {
63 if (bookmark_drag_data_.is_valid()) { 63 if (bookmark_drag_data_.is_valid()) {
64 bookmark_tab_helper_->bookmark_drag_delegate()->OnDrop( 64 bookmark_tab_helper_->bookmark_drag_delegate()->OnDrop(
65 bookmark_drag_data_); 65 bookmark_drag_data_);
66 } 66 }
67 } 67 }
68 68
69 // Focus the target browser. 69 // Focus the target browser.
70 Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); 70 Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
71 if (browser) 71 if (browser)
72 browser->window()->Show(); 72 browser->window()->Show(true /* user_gesture */);
73 } 73 }
74 74
75 bookmark_drag_data_.Clear(); 75 bookmark_drag_data_.Clear();
76 } 76 }
77 77
78 void WebDragBookmarkHandlerAura::OnDragLeave() { 78 void WebDragBookmarkHandlerAura::OnDragLeave() {
79 if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) { 79 if (bookmark_tab_helper_ && bookmark_tab_helper_->bookmark_drag_delegate()) {
80 if (bookmark_drag_data_.is_valid()) 80 if (bookmark_drag_data_.is_valid())
81 bookmark_tab_helper_->bookmark_drag_delegate()->OnDragLeave( 81 bookmark_tab_helper_->bookmark_drag_delegate()->OnDragLeave(
82 bookmark_drag_data_); 82 bookmark_drag_data_);
83 } 83 }
84 84
85 bookmark_drag_data_.Clear(); 85 bookmark_drag_data_.Clear();
86 } 86 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/browser_close_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698