OLD | NEW |
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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 return; | 566 return; |
567 } | 567 } |
568 | 568 |
569 Browser* browser = BrowserList::GetLastActive(); | 569 Browser* browser = BrowserList::GetLastActive(); |
570 // if no browser window exists then create one with no tabs to be filled in | 570 // if no browser window exists then create one with no tabs to be filled in |
571 if (!browser) { | 571 if (!browser) { |
572 browser = Browser::Create([self defaultProfile]); | 572 browser = Browser::Create([self defaultProfile]); |
573 browser->window()->Show(); | 573 browser->window()->Show(); |
574 } | 574 } |
575 | 575 |
576 CommandLine dummy((std::wstring())); | 576 CommandLine dummy(CommandLine::ARGUMENTS_ONLY); |
577 BrowserInit::LaunchWithProfile launch(std::wstring(), dummy); | 577 BrowserInit::LaunchWithProfile launch(std::wstring(), dummy); |
578 launch.OpenURLsInBrowser(browser, false, urls); | 578 launch.OpenURLsInBrowser(browser, false, urls); |
579 } | 579 } |
580 | 580 |
581 - (void)openPendingURLs { | 581 - (void)openPendingURLs { |
582 // Since the existence of pendingURLs_ is a flag that it's too early to | 582 // Since the existence of pendingURLs_ is a flag that it's too early to |
583 // open URLs, we need to reset pendingURLs_. | 583 // open URLs, we need to reset pendingURLs_. |
584 std::vector<GURL> urls; | 584 std::vector<GURL> urls; |
585 swap(urls, *pendingURLs_); | 585 swap(urls, *pendingURLs_); |
586 pendingURLs_.reset(); | 586 pendingURLs_.reset(); |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
729 @end | 729 @end |
730 | 730 |
731 //--------------------------------------------------------------------------- | 731 //--------------------------------------------------------------------------- |
732 | 732 |
733 // Stub for cross-platform method that isn't called on Mac OS X. | 733 // Stub for cross-platform method that isn't called on Mac OS X. |
734 void ShowOptionsWindow(OptionsPage page, | 734 void ShowOptionsWindow(OptionsPage page, |
735 OptionsGroup highlight_group, | 735 OptionsGroup highlight_group, |
736 Profile* profile) { | 736 Profile* profile) { |
737 NOTIMPLEMENTED(); | 737 NOTIMPLEMENTED(); |
738 } | 738 } |
OLD | NEW |