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

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

Issue 164547: Mac: make save/open dialogs operate as tab-modal sheets.... Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Painfully (but hopefully correctly) merged ToT. Created 11 years, 2 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/nibs/TabContents.xib ('k') | chrome/browser/blocked_popup_container.h » ('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) 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 #import "chrome/browser/app_controller_mac.h" 5 #import "chrome/browser/app_controller_mac.h"
6 6
7 #include "app/l10n_util_mac.h" 7 #include "app/l10n_util_mac.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/mac_util.h" 9 #include "base/mac_util.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 } 507 }
508 508
509 - (void)initMenuState { 509 - (void)initMenuState {
510 menuState_.reset(new CommandUpdater(NULL)); 510 menuState_.reset(new CommandUpdater(NULL));
511 menuState_->UpdateCommandEnabled(IDC_NEW_TAB, true); 511 menuState_->UpdateCommandEnabled(IDC_NEW_TAB, true);
512 menuState_->UpdateCommandEnabled(IDC_NEW_WINDOW, true); 512 menuState_->UpdateCommandEnabled(IDC_NEW_WINDOW, true);
513 menuState_->UpdateCommandEnabled(IDC_NEW_INCOGNITO_WINDOW, true); 513 menuState_->UpdateCommandEnabled(IDC_NEW_INCOGNITO_WINDOW, true);
514 menuState_->UpdateCommandEnabled(IDC_OPEN_FILE, true); 514 menuState_->UpdateCommandEnabled(IDC_OPEN_FILE, true);
515 menuState_->UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, true); 515 menuState_->UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, true);
516 menuState_->UpdateCommandEnabled(IDC_RESTORE_TAB, false); 516 menuState_->UpdateCommandEnabled(IDC_RESTORE_TAB, false);
517
518 menuState_->UpdateCommandEnabled(IDC_ENCODING_MENU, true);
517 // TODO(pinkerton): ...more to come... 519 // TODO(pinkerton): ...more to come...
518 } 520 }
519 521
520 - (Profile*)defaultProfile { 522 - (Profile*)defaultProfile {
521 // TODO(jrg): Find a better way to get the "default" profile. 523 // TODO(jrg): Find a better way to get the "default" profile.
522 if (g_browser_process->profile_manager()) 524 if (g_browser_process->profile_manager())
523 return* g_browser_process->profile_manager()->begin(); 525 return* g_browser_process->profile_manager()->begin();
524 526
525 return NULL; 527 return NULL;
526 } 528 }
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 @end 702 @end
701 703
702 //--------------------------------------------------------------------------- 704 //---------------------------------------------------------------------------
703 705
704 // Stub for cross-platform method that isn't called on Mac OS X. 706 // Stub for cross-platform method that isn't called on Mac OS X.
705 void ShowOptionsWindow(OptionsPage page, 707 void ShowOptionsWindow(OptionsPage page,
706 OptionsGroup highlight_group, 708 OptionsGroup highlight_group,
707 Profile* profile) { 709 Profile* profile) {
708 NOTIMPLEMENTED(); 710 NOTIMPLEMENTED();
709 } 711 }
OLDNEW
« no previous file with comments | « chrome/app/nibs/TabContents.xib ('k') | chrome/browser/blocked_popup_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698