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

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

Issue 5301006: [Mac] Prevent constrained windows (sheets) from opening while instant preview... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/cocoa/browser_window_controller.h" 5 #import "chrome/browser/cocoa/browser_window_controller.h"
6 6
7 #include <Carbon/Carbon.h> 7 #include <Carbon/Carbon.h>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/l10n_util_mac.h" 10 #include "app/l10n_util_mac.h"
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 } 437 }
438 438
439 - (void)attachConstrainedWindow:(ConstrainedWindowMac*)window { 439 - (void)attachConstrainedWindow:(ConstrainedWindowMac*)window {
440 [tabStripController_ attachConstrainedWindow:window]; 440 [tabStripController_ attachConstrainedWindow:window];
441 } 441 }
442 442
443 - (void)removeConstrainedWindow:(ConstrainedWindowMac*)window { 443 - (void)removeConstrainedWindow:(ConstrainedWindowMac*)window {
444 [tabStripController_ removeConstrainedWindow:window]; 444 [tabStripController_ removeConstrainedWindow:window];
445 } 445 }
446 446
447 - (BOOL)canAttachConstrainedWindow {
448 return ![previewableContentsController_ isShowingPreview];
449 }
450
447 - (void)updateDevToolsForContents:(TabContents*)contents { 451 - (void)updateDevToolsForContents:(TabContents*)contents {
448 [devToolsController_ updateDevToolsForTabContents:contents]; 452 [devToolsController_ updateDevToolsForTabContents:contents];
449 [devToolsController_ ensureContentsVisible]; 453 [devToolsController_ ensureContentsVisible];
450 } 454 }
451 455
452 - (void)updateSidebarForContents:(TabContents*)contents { 456 - (void)updateSidebarForContents:(TabContents*)contents {
453 [sidebarController_ updateSidebarForTabContents:contents]; 457 [sidebarController_ updateSidebarForTabContents:contents];
454 [sidebarController_ ensureContentsVisible]; 458 [sidebarController_ ensureContentsVisible];
455 } 459 }
456 460
(...skipping 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after
2046 2050
2047 - (BOOL)supportsBookmarkBar { 2051 - (BOOL)supportsBookmarkBar {
2048 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2052 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2049 } 2053 }
2050 2054
2051 - (BOOL)isNormalWindow { 2055 - (BOOL)isNormalWindow {
2052 return browser_->type() == Browser::TYPE_NORMAL; 2056 return browser_->type() == Browser::TYPE_NORMAL;
2053 } 2057 }
2054 2058
2055 @end // @implementation BrowserWindowController(WindowType) 2059 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/browser_window_controller.h ('k') | chrome/browser/cocoa/constrained_window_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698