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

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

Issue 7329034: Multi-Profiles: Enable multi-profiles by default for views ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Multi-Profiles: Enable multi-profiles by default for views ui Created 9 years, 5 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 | « chrome/browser/sync/sync_ui_util.cc ('k') | chrome/browser/ui/gtk/browser_titlebar.cc » ('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) 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 "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
11 #import "base/memory/scoped_nsobject.h" 11 #import "base/memory/scoped_nsobject.h"
12 #include "base/sys_string_conversions.h" 12 #include "base/sys_string_conversions.h"
13 #include "chrome/app/chrome_command_ids.h" // IDC_* 13 #include "chrome/app/chrome_command_ids.h" // IDC_*
14 #include "chrome/browser/bookmarks/bookmark_editor.h" 14 #include "chrome/browser/bookmarks/bookmark_editor.h"
15 #include "chrome/browser/google/google_util.h" 15 #include "chrome/browser/google/google_util.h"
16 #include "chrome/browser/instant/instant_controller.h" 16 #include "chrome/browser/instant/instant_controller.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/profiles/profile_manager.h"
18 #include "chrome/browser/sync/profile_sync_service.h" 19 #include "chrome/browser/sync/profile_sync_service.h"
19 #include "chrome/browser/sync/sync_ui_util_mac.h" 20 #include "chrome/browser/sync/sync_ui_util_mac.h"
20 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" 21 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
21 #include "chrome/browser/tabs/tab_strip_model.h" 22 #include "chrome/browser/tabs/tab_strip_model.h"
22 #include "chrome/browser/themes/theme_service.h" 23 #include "chrome/browser/themes/theme_service.h"
23 #include "chrome/browser/themes/theme_service_factory.h" 24 #include "chrome/browser/themes/theme_service_factory.h"
24 #include "chrome/browser/ui/browser.h" 25 #include "chrome/browser/ui/browser.h"
25 #include "chrome/browser/ui/browser_list.h" 26 #include "chrome/browser/ui/browser_list.h"
26 #import "chrome/browser/ui/cocoa/background_gradient_view.h" 27 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
27 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 28 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after
1303 - (BOOL)isTabFullyVisible:(TabView*)tab { 1304 - (BOOL)isTabFullyVisible:(TabView*)tab {
1304 return [tabStripController_ isTabFullyVisible:tab]; 1305 return [tabStripController_ isTabFullyVisible:tab];
1305 } 1306 }
1306 1307
1307 - (void)showNewTabButton:(BOOL)show { 1308 - (void)showNewTabButton:(BOOL)show {
1308 [tabStripController_ showNewTabButton:show]; 1309 [tabStripController_ showNewTabButton:show];
1309 } 1310 }
1310 1311
1311 - (BOOL)shouldShowAvatar { 1312 - (BOOL)shouldShowAvatar {
1312 return [self hasTabStrip] && (browser_->profile()->IsOffTheRecord() || 1313 return [self hasTabStrip] && (browser_->profile()->IsOffTheRecord() ||
1313 CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles)); 1314 ProfileManager::IsMultipleProfilesEnabled());
1314 } 1315 }
1315 1316
1316 - (BOOL)isBookmarkBarVisible { 1317 - (BOOL)isBookmarkBarVisible {
1317 return [bookmarkBarController_ isVisible]; 1318 return [bookmarkBarController_ isVisible];
1318 } 1319 }
1319 1320
1320 - (BOOL)isBookmarkBarAnimating { 1321 - (BOOL)isBookmarkBarAnimating {
1321 return [bookmarkBarController_ isAnimationRunning]; 1322 return [bookmarkBarController_ isAnimationRunning];
1322 } 1323 }
1323 1324
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 2176
2176 - (BOOL)supportsBookmarkBar { 2177 - (BOOL)supportsBookmarkBar {
2177 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2178 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2178 } 2179 }
2179 2180
2180 - (BOOL)isTabbedWindow { 2181 - (BOOL)isTabbedWindow {
2181 return browser_->is_type_tabbed(); 2182 return browser_->is_type_tabbed();
2182 } 2183 }
2183 2184
2184 @end // @implementation BrowserWindowController(WindowType) 2185 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | chrome/browser/ui/gtk/browser_titlebar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698