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

Side by Side Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 23698003: [temporary M30 fix] Disable dragging tabs with web contents modal dialogs displayed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comment 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 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/ui/views/tabs/browser_tab_strip_controller.h" 5 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/extensions/tab_helper.h" 12 #include "chrome/browser/extensions/tab_helper.h"
13 #include "chrome/browser/favicon/favicon_tab_helper.h" 13 #include "chrome/browser/favicon/favicon_tab_helper.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/search/search.h" 15 #include "chrome/browser/search/search.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_tabstrip.h" 17 #include "chrome/browser/ui/browser_tabstrip.h"
18 #include "chrome/browser/ui/tabs/tab_menu_model.h" 18 #include "chrome/browser/ui/tabs/tab_menu_model.h"
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 20 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
21 #include "chrome/browser/ui/tabs/tab_utils.h" 21 #include "chrome/browser/ui/tabs/tab_utils.h"
22 #include "chrome/browser/ui/views/frame/browser_view.h" 22 #include "chrome/browser/ui/views/frame/browser_view.h"
23 #include "chrome/browser/ui/views/tabs/tab.h" 23 #include "chrome/browser/ui/views/tabs/tab.h"
24 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h" 24 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
25 #include "chrome/browser/ui/views/tabs/tab_strip.h" 25 #include "chrome/browser/ui/views/tabs/tab_strip.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
28 #include "chrome/common/url_constants.h" 28 #include "chrome/common/url_constants.h"
29 #include "components/web_modal/web_contents_modal_dialog_manager.h"
29 #include "content/public/browser/notification_service.h" 30 #include "content/public/browser/notification_service.h"
30 #include "content/public/browser/user_metrics.h" 31 #include "content/public/browser/user_metrics.h"
31 #include "content/public/browser/web_contents.h" 32 #include "content/public/browser/web_contents.h"
32 #include "ui/base/layout.h" 33 #include "ui/base/layout.h"
33 #include "ui/base/models/list_selection_model.h" 34 #include "ui/base/models/list_selection_model.h"
34 #include "ui/gfx/image/image.h" 35 #include "ui/gfx/image/image.h"
35 #include "ui/views/controls/menu/menu_item_view.h" 36 #include "ui/views/controls/menu/menu_item_view.h"
36 #include "ui/views/controls/menu/menu_runner.h" 37 #include "ui/views/controls/menu/menu_runner.h"
37 #include "ui/views/widget/widget.h" 38 #include "ui/views/widget/widget.h"
38 39
39 using content::UserMetricsAction; 40 using content::UserMetricsAction;
40 using content::WebContents; 41 using content::WebContents;
42 using web_modal::WebContentsModalDialogManager;
41 43
42 namespace { 44 namespace {
43 45
44 TabRendererData::NetworkState TabContentsNetworkState( 46 TabRendererData::NetworkState TabContentsNetworkState(
45 WebContents* contents) { 47 WebContents* contents) {
46 if (!contents || !contents->IsLoading()) 48 if (!contents || !contents->IsLoading())
47 return TabRendererData::NETWORK_STATE_NONE; 49 return TabRendererData::NETWORK_STATE_NONE;
48 if (contents->IsWaitingForResponse()) 50 if (contents->IsWaitingForResponse())
49 return TabRendererData::NETWORK_STATE_WAITING; 51 return TabRendererData::NETWORK_STATE_WAITING;
50 return TabRendererData::NETWORK_STATE_LOADING; 52 return TabRendererData::NETWORK_STATE_LOADING;
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 TabStripLayoutType layout_type = 359 TabStripLayoutType layout_type =
358 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout); 360 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);
359 if (!adjust_layout || layout_type == tabstrip_->layout_type()) 361 if (!adjust_layout || layout_type == tabstrip_->layout_type())
360 return; 362 return;
361 363
362 g_browser_process->local_state()->SetInteger( 364 g_browser_process->local_state()->SetInteger(
363 prefs::kTabStripLayoutType, 365 prefs::kTabStripLayoutType,
364 static_cast<int>(tabstrip_->layout_type())); 366 static_cast<int>(tabstrip_->layout_type()));
365 } 367 }
366 368
369 bool BrowserTabStripController::IsTabShowingWebViewModalDialog(int index) {
370 DCHECK(model_->ContainsIndex(index));
371 WebContentsModalDialogManager* contents_modal_dialog_manager =
372 WebContentsModalDialogManager::FromWebContents(
373 model_->GetWebContentsAt(index));
374 return contents_modal_dialog_manager &&
375 contents_modal_dialog_manager->IsShowingDialog();
376 }
377
367 void BrowserTabStripController::OnStartedDraggingTabs() { 378 void BrowserTabStripController::OnStartedDraggingTabs() {
368 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_); 379 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
369 if (browser_view && !immersive_reveal_lock_.get()) { 380 if (browser_view && !immersive_reveal_lock_.get()) {
370 // The top-of-window views should be revealed while the user is dragging 381 // The top-of-window views should be revealed while the user is dragging
371 // tabs in immersive fullscreen. The top-of-window views may not be already 382 // tabs in immersive fullscreen. The top-of-window views may not be already
372 // revealed if the user is attempting to attach a tab to a tabstrip 383 // revealed if the user is attempting to attach a tab to a tabstrip
373 // belonging to an immersive fullscreen window. 384 // belonging to an immersive fullscreen window.
374 immersive_reveal_lock_.reset( 385 immersive_reveal_lock_.reset(
375 browser_view->immersive_mode_controller()->GetRevealedLock( 386 browser_view->immersive_mode_controller()->GetRevealedLock(
376 ImmersiveModeController::ANIMATE_REVEAL_NO)); 387 ImmersiveModeController::ANIMATE_REVEAL_NO));
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 SetTabRendererDataFromModel(contents, index, &data, NEW_TAB); 539 SetTabRendererDataFromModel(contents, index, &data, NEW_TAB);
529 tabstrip_->AddTabAt(index, data, is_active); 540 tabstrip_->AddTabAt(index, data, is_active);
530 } 541 }
531 542
532 void BrowserTabStripController::UpdateLayoutType() { 543 void BrowserTabStripController::UpdateLayoutType() {
533 bool adjust_layout = false; 544 bool adjust_layout = false;
534 TabStripLayoutType layout_type = 545 TabStripLayoutType layout_type =
535 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout); 546 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);
536 tabstrip_->SetLayoutType(layout_type, adjust_layout); 547 tabstrip_->SetLayoutType(layout_type, adjust_layout);
537 } 548 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698