OLD | NEW |
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 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1382 g_browser_process->profile_manager()->GetProfileInfoCache(); | 1382 g_browser_process->profile_manager()->GetProfileInfoCache(); |
1383 if (cache.GetIndexOfProfileWithPath(browser_->profile()->GetPath()) == | 1383 if (cache.GetIndexOfProfileWithPath(browser_->profile()->GetPath()) == |
1384 std::string::npos) { | 1384 std::string::npos) { |
1385 return NO; | 1385 return NO; |
1386 } | 1386 } |
1387 | 1387 |
1388 return AvatarMenu::ShouldShowAvatarMenu(); | 1388 return AvatarMenu::ShouldShowAvatarMenu(); |
1389 } | 1389 } |
1390 | 1390 |
1391 - (BOOL)shouldUseNewAvatarButton { | 1391 - (BOOL)shouldUseNewAvatarButton { |
1392 return switches::IsNewAvatarMenu() && | 1392 return profiles::IsRegularOrGuestSession(browser_.get()); |
1393 profiles::IsRegularOrGuestSession(browser_.get()); | |
1394 } | 1393 } |
1395 | 1394 |
1396 - (BOOL)isBookmarkBarVisible { | 1395 - (BOOL)isBookmarkBarVisible { |
1397 return [bookmarkBarController_ isVisible]; | 1396 return [bookmarkBarController_ isVisible]; |
1398 } | 1397 } |
1399 | 1398 |
1400 - (BOOL)isBookmarkBarAnimating { | 1399 - (BOOL)isBookmarkBarAnimating { |
1401 return [bookmarkBarController_ isAnimationRunning]; | 1400 return [bookmarkBarController_ isAnimationRunning]; |
1402 } | 1401 } |
1403 | 1402 |
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2061 | 2060 |
2062 - (BOOL)supportsBookmarkBar { | 2061 - (BOOL)supportsBookmarkBar { |
2063 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 2062 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; |
2064 } | 2063 } |
2065 | 2064 |
2066 - (BOOL)isTabbedWindow { | 2065 - (BOOL)isTabbedWindow { |
2067 return browser_->is_type_tabbed(); | 2066 return browser_->is_type_tabbed(); |
2068 } | 2067 } |
2069 | 2068 |
2070 @end // @implementation BrowserWindowController(WindowType) | 2069 @end // @implementation BrowserWindowController(WindowType) |
OLD | NEW |