OLD | NEW |
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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1010 } | 1010 } |
1011 case IDC_IMPORT_SETTINGS: { | 1011 case IDC_IMPORT_SETTINGS: { |
1012 if (Browser* browser = ActivateBrowser(lastProfile)) { | 1012 if (Browser* browser = ActivateBrowser(lastProfile)) { |
1013 chrome::ShowImportDialog(browser); | 1013 chrome::ShowImportDialog(browser); |
1014 } else { | 1014 } else { |
1015 chrome::OpenImportSettingsDialogWindow(lastProfile); | 1015 chrome::OpenImportSettingsDialogWindow(lastProfile); |
1016 } | 1016 } |
1017 break; | 1017 break; |
1018 } | 1018 } |
1019 case IDC_SHOW_BOOKMARK_MANAGER: | 1019 case IDC_SHOW_BOOKMARK_MANAGER: |
1020 base::RecordAction(UserMetricsAction("ShowBookmarkManager")); | |
1021 if (Browser* browser = ActivateBrowser(lastProfile)) { | 1020 if (Browser* browser = ActivateBrowser(lastProfile)) { |
1022 chrome::ShowBookmarkManager(browser); | 1021 chrome::ShowBookmarkManager(browser); |
1023 } else { | 1022 } else { |
1024 // No browser window, so create one for the bookmark manager tab. | 1023 // No browser window, so create one for the bookmark manager tab. |
1025 chrome::OpenBookmarkManagerWindow(lastProfile); | 1024 chrome::OpenBookmarkManagerWindow(lastProfile); |
1026 } | 1025 } |
1027 break; | 1026 break; |
1028 case IDC_SHOW_HISTORY: | 1027 case IDC_SHOW_HISTORY: |
1029 if (Browser* browser = ActivateBrowser(lastProfile)) | 1028 if (Browser* browser = ActivateBrowser(lastProfile)) |
1030 chrome::ShowHistory(browser); | 1029 chrome::ShowHistory(browser); |
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1617 | 1616 |
1618 //--------------------------------------------------------------------------- | 1617 //--------------------------------------------------------------------------- |
1619 | 1618 |
1620 namespace app_controller_mac { | 1619 namespace app_controller_mac { |
1621 | 1620 |
1622 bool IsOpeningNewWindow() { | 1621 bool IsOpeningNewWindow() { |
1623 return g_is_opening_new_window; | 1622 return g_is_opening_new_window; |
1624 } | 1623 } |
1625 | 1624 |
1626 } // namespace app_controller_mac | 1625 } // namespace app_controller_mac |
OLD | NEW |