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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 23815006: [Cleanup] rename WebContentsModalDialogManager::IsShowingDialog() to IsDialogActive() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <numeric> 8 #include <numeric>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1566 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 1577
1578 - (BOOL)isTabDraggable:(NSView*)tabView { 1578 - (BOOL)isTabDraggable:(NSView*)tabView {
1579 // TODO(avi, thakis): ConstrainedWindowSheetController has no api to move 1579 // TODO(avi, thakis): ConstrainedWindowSheetController has no api to move
1580 // tabsheets between windows. Until then, we have to prevent having to move a 1580 // tabsheets between windows. Until then, we have to prevent having to move a
1581 // tabsheet between windows, e.g. no tearing off of tabs. 1581 // tabsheet between windows, e.g. no tearing off of tabs.
1582 int index = [tabStripController_ modelIndexForTabView:tabView]; 1582 int index = [tabStripController_ modelIndexForTabView:tabView];
1583 WebContents* contents = browser_->tab_strip_model()->GetWebContentsAt(index); 1583 WebContents* contents = browser_->tab_strip_model()->GetWebContentsAt(index);
1584 if (!contents) 1584 if (!contents)
1585 return NO; 1585 return NO;
1586 return !WebContentsModalDialogManager::FromWebContents(contents)-> 1586 return !WebContentsModalDialogManager::FromWebContents(contents)->
1587 IsShowingDialog(); 1587 IsDialogActive();
1588 } 1588 }
1589 1589
1590 // TabStripControllerDelegate protocol. 1590 // TabStripControllerDelegate protocol.
1591 - (void)onActivateTabWithContents:(WebContents*)contents { 1591 - (void)onActivateTabWithContents:(WebContents*)contents {
1592 // Update various elements that are interested in knowing the current 1592 // Update various elements that are interested in knowing the current
1593 // WebContents. 1593 // WebContents.
1594 1594
1595 // Update all the UI bits. 1595 // Update all the UI bits.
1596 windowShim_->UpdateTitleBar(); 1596 windowShim_->UpdateTitleBar();
1597 1597
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
2237 2237
2238 - (BOOL)supportsBookmarkBar { 2238 - (BOOL)supportsBookmarkBar {
2239 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2239 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2240 } 2240 }
2241 2241
2242 - (BOOL)isTabbedWindow { 2242 - (BOOL)isTabbedWindow {
2243 return browser_->is_type_tabbed(); 2243 return browser_->is_type_tabbed();
2244 } 2244 }
2245 2245
2246 @end // @implementation BrowserWindowController(WindowType) 2246 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_commands.cc ('k') | chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698