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

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

Issue 11026050: Fix crash when using Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #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 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after
1578 // TODO(viettrungluu): perhaps update to not terminate running animations? 1578 // TODO(viettrungluu): perhaps update to not terminate running animations?
1579 if (change != TabStripModelObserver::TITLE_NOT_LOADING) 1579 if (change != TabStripModelObserver::TITLE_NOT_LOADING)
1580 [self updateBookmarkBarVisibilityWithAnimation:NO]; 1580 [self updateBookmarkBarVisibilityWithAnimation:NO];
1581 } 1581 }
1582 1582
1583 - (void)onTabDetachedWithContents:(WebContents*)contents { 1583 - (void)onTabDetachedWithContents:(WebContents*)contents {
1584 TabContents* tabContents = TabContents::FromWebContents(contents); 1584 TabContents* tabContents = TabContents::FromWebContents(contents);
1585 [infoBarContainerController_ tabDetachedWithContents:tabContents]; 1585 [infoBarContainerController_ tabDetachedWithContents:tabContents];
1586 } 1586 }
1587 1587
1588 - (void)onInsertTabWithContents:(WebContents*)contents {
1589 [previewableContentsController_ onInsertTabWithContents:contents];
1590 }
1591
1588 - (void)userChangedTheme { 1592 - (void)userChangedTheme {
1589 // TODO(dmaclach): Instead of redrawing the whole window, views that care 1593 // TODO(dmaclach): Instead of redrawing the whole window, views that care
1590 // about the active window state should be registering for notifications. 1594 // about the active window state should be registering for notifications.
1591 [[self window] setViewsNeedDisplay:YES]; 1595 [[self window] setViewsNeedDisplay:YES];
1592 } 1596 }
1593 1597
1594 - (ui::ThemeProvider*)themeProvider { 1598 - (ui::ThemeProvider*)themeProvider {
1595 return ThemeServiceFactory::GetForProfile(browser_->profile()); 1599 return ThemeServiceFactory::GetForProfile(browser_->profile());
1596 } 1600 }
1597 1601
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
2203 2207
2204 - (BOOL)supportsBookmarkBar { 2208 - (BOOL)supportsBookmarkBar {
2205 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2209 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2206 } 2210 }
2207 2211
2208 - (BOOL)isTabbedWindow { 2212 - (BOOL)isTabbedWindow {
2209 return browser_->is_type_tabbed(); 2213 return browser_->is_type_tabbed();
2210 } 2214 }
2211 2215
2212 @end // @implementation BrowserWindowController(WindowType) 2216 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698