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

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

Issue 67156: Fix regression I introduced where Stop/Go button would toggle state instantly... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 8 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "base/gfx/rect.h" 5 #include "base/gfx/rect.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "chrome/browser/cocoa/browser_window_cocoa.h" 7 #include "chrome/browser/cocoa/browser_window_cocoa.h"
8 #include "chrome/browser/cocoa/browser_window_controller.h" 8 #include "chrome/browser/cocoa/browser_window_controller.h"
9 #include "chrome/browser/browser.h" 9 #include "chrome/browser/browser.h"
10 10
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 111 }
112 112
113 LocationBar* BrowserWindowCocoa::GetLocationBar() const { 113 LocationBar* BrowserWindowCocoa::GetLocationBar() const {
114 return [controller_ locationBar]; 114 return [controller_ locationBar];
115 } 115 }
116 116
117 void BrowserWindowCocoa::SetFocusToLocationBar() { 117 void BrowserWindowCocoa::SetFocusToLocationBar() {
118 [controller_ focusLocationBar]; 118 [controller_ focusLocationBar];
119 } 119 }
120 120
121 void BrowserWindowCocoa::UpdateStopGoState(bool is_loading) { 121 void BrowserWindowCocoa::UpdateStopGoState(bool is_loading, bool force) {
122 [controller_ setIsLoading:is_loading ? YES : NO]; 122 [controller_ setIsLoading:is_loading ? YES : NO];
123 } 123 }
124 124
125 void BrowserWindowCocoa::UpdateToolbar(TabContents* contents, 125 void BrowserWindowCocoa::UpdateToolbar(TabContents* contents,
126 bool should_restore_state) { 126 bool should_restore_state) {
127 [controller_ updateToolbarWithContents:contents 127 [controller_ updateToolbarWithContents:contents
128 shouldRestoreState:should_restore_state ? YES : NO]; 128 shouldRestoreState:should_restore_state ? YES : NO];
129 } 129 }
130 130
131 void BrowserWindowCocoa::FocusToolbar() { 131 void BrowserWindowCocoa::FocusToolbar() {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 void* parent_window) { 201 void* parent_window) {
202 NOTIMPLEMENTED(); 202 NOTIMPLEMENTED();
203 } 203 }
204 204
205 void BrowserWindowCocoa::DestroyBrowser() { 205 void BrowserWindowCocoa::DestroyBrowser() {
206 [controller_ destroyBrowser]; 206 [controller_ destroyBrowser];
207 207
208 // at this point the controller is dead (autoreleased), so 208 // at this point the controller is dead (autoreleased), so
209 // make sure we don't try to reference it any more. 209 // make sure we don't try to reference it any more.
210 } 210 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698