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

Unified Diff: trunk/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 23814008: Revert 220417 "[temporary M30 fix] Disable dragging tabs with we..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc (revision 221832)
+++ trunk/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc (working copy)
@@ -26,7 +26,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
-#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/user_metrics.h"
#include "content/public/browser/web_contents.h"
@@ -39,7 +38,6 @@
using content::UserMetricsAction;
using content::WebContents;
-using web_modal::WebContentsModalDialogManager;
namespace {
@@ -366,15 +364,6 @@
static_cast<int>(tabstrip_->layout_type()));
}
-bool BrowserTabStripController::IsTabShowingWebViewModalDialog(int index) {
- DCHECK(model_->ContainsIndex(index));
- WebContentsModalDialogManager* contents_modal_dialog_manager =
- WebContentsModalDialogManager::FromWebContents(
- model_->GetWebContentsAt(index));
- return contents_modal_dialog_manager &&
- contents_modal_dialog_manager->IsShowingDialog();
-}
-
void BrowserTabStripController::OnStartedDraggingTabs() {
BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
if (browser_view && !immersive_reveal_lock_.get()) {

Powered by Google App Engine
This is Rietveld 408576698