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

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

Issue 7621031: Revert 97049 - Trying to see if it fixes sync_integration_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <Carbon/Carbon.h> 7 #include <Carbon/Carbon.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <numeric> 10 #include <numeric>
(...skipping 1350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 1361
1362 - (BOOL)shouldShowAvatar { 1362 - (BOOL)shouldShowAvatar {
1363 if (![self hasTabStrip]) 1363 if (![self hasTabStrip])
1364 return NO; 1364 return NO;
1365 1365
1366 if (browser_->profile()->IsOffTheRecord()) 1366 if (browser_->profile()->IsOffTheRecord())
1367 return YES; 1367 return YES;
1368 1368
1369 if (ProfileManager::IsMultipleProfilesEnabled()) { 1369 if (ProfileManager::IsMultipleProfilesEnabled()) {
1370 // Show the profile avatar after the user has created more than one profile. 1370 // Show the profile avatar after the user has created more than one profile.
1371 ProfileInfoInterface& cache = 1371 ProfileInfoCache& cache =
1372 g_browser_process->profile_manager()->GetProfileInfo(); 1372 g_browser_process->profile_manager()->GetProfileInfoCache();
1373 return cache.GetNumberOfProfiles() > 1; 1373 return cache.GetNumberOfProfiles() > 1;
1374 } 1374 }
1375 1375
1376 return NO; 1376 return NO;
1377 } 1377 }
1378 1378
1379 - (BOOL)isBookmarkBarVisible { 1379 - (BOOL)isBookmarkBarVisible {
1380 return [bookmarkBarController_ isVisible]; 1380 return [bookmarkBarController_ isVisible];
1381 } 1381 }
1382 1382
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 2175
2176 - (BOOL)supportsBookmarkBar { 2176 - (BOOL)supportsBookmarkBar {
2177 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2177 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2178 } 2178 }
2179 2179
2180 - (BOOL)isTabbedWindow { 2180 - (BOOL)isTabbedWindow {
2181 return browser_->is_type_tabbed(); 2181 return browser_->is_type_tabbed();
2182 } 2182 }
2183 2183
2184 @end // @implementation BrowserWindowController(WindowType) 2184 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_test_helper.cc ('k') | chrome/browser/ui/gtk/browser_titlebar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698