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

Side by Side Diff: chrome/browser/app_controller_mac.mm

Issue 10837158: mac: Delete more 10.5-only code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mark Created 8 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/gpu_util.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) 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/app_controller_mac.h" 5 #import "chrome/browser/app_controller_mac.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 menuState_->UpdateCommandEnabled(IDC_FEEDBACK, true); 1019 menuState_->UpdateCommandEnabled(IDC_FEEDBACK, true);
1020 menuState_->UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP, true); 1020 menuState_->UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP, true);
1021 menuState_->UpdateCommandEnabled(IDC_TASK_MANAGER, true); 1021 menuState_->UpdateCommandEnabled(IDC_TASK_MANAGER, true);
1022 } 1022 }
1023 1023
1024 // Conditionally adds the Profile menu to the main menu bar. 1024 // Conditionally adds the Profile menu to the main menu bar.
1025 - (void)initProfileMenu { 1025 - (void)initProfileMenu {
1026 NSMenu* mainMenu = [NSApp mainMenu]; 1026 NSMenu* mainMenu = [NSApp mainMenu];
1027 NSMenuItem* profileMenu = [mainMenu itemWithTag:IDC_PROFILE_MAIN_MENU]; 1027 NSMenuItem* profileMenu = [mainMenu itemWithTag:IDC_PROFILE_MAIN_MENU];
1028 1028
1029 // On Leopard, hiding main menubar items does not work. This manifests itself 1029 if (!ProfileManager::IsMultipleProfilesEnabled()) {
1030 // in Chromium as squished menu items <http://crbug.com/90753>. To prevent
1031 // this, remove the Profile menu on Leopard, regardless of the user's
1032 // multiprofile state.
1033 if (!ProfileManager::IsMultipleProfilesEnabled() ||
1034 base::mac::IsOSLeopard()) {
1035 [mainMenu removeItem:profileMenu]; 1030 [mainMenu removeItem:profileMenu];
1036 return; 1031 return;
1037 } 1032 }
1038 1033
1039 // The controller will unhide the menu if necessary. 1034 // The controller will unhide the menu if necessary.
1040 [profileMenu setHidden:YES]; 1035 [profileMenu setHidden:YES];
1041 1036
1042 profileMenuController_.reset( 1037 profileMenuController_.reset(
1043 [[ProfileMenuController alloc] initWithMainMenuItem:profileMenu]); 1038 [[ProfileMenuController alloc] initWithMainMenuItem:profileMenu]);
1044 } 1039 }
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
1295 1290
1296 //--------------------------------------------------------------------------- 1291 //---------------------------------------------------------------------------
1297 1292
1298 namespace app_controller_mac { 1293 namespace app_controller_mac {
1299 1294
1300 bool IsOpeningNewWindow() { 1295 bool IsOpeningNewWindow() {
1301 return g_is_opening_new_window; 1296 return g_is_opening_new_window;
1302 } 1297 }
1303 1298
1304 } // namespace app_controller_mac 1299 } // namespace app_controller_mac
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/gpu_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698