| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #include "chrome/browser/views/toolbar_view.h" | 5 #include "chrome/browser/views/toolbar_view.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 565 l10n_util::GetString(IDS_NEW_INCOGNITO_WINDOW)); | 565 l10n_util::GetString(IDS_NEW_INCOGNITO_WINDOW)); |
| 566 | 566 |
| 567 // Enumerate profiles asynchronously and then create the parent menu item. | 567 // Enumerate profiles asynchronously and then create the parent menu item. |
| 568 // We will create the child menu items for this once the asynchronous call is | 568 // We will create the child menu items for this once the asynchronous call is |
| 569 // done. See OnGetProfilesDone(). | 569 // done. See OnGetProfilesDone(). |
| 570 profiles_helper_->GetProfiles(NULL); | 570 profiles_helper_->GetProfiles(NULL); |
| 571 profiles_menu_ = menu.AppendSubMenu(IDC_PROFILE_MENU, | 571 profiles_menu_ = menu.AppendSubMenu(IDC_PROFILE_MENU, |
| 572 l10n_util::GetString(IDS_PROFILE_MENU)); | 572 l10n_util::GetString(IDS_PROFILE_MENU)); |
| 573 | 573 |
| 574 menu.AppendSeparator(); | 574 menu.AppendSeparator(); |
| 575 menu.AppendMenuItemWithLabel(IDC_OPEN_FILE, |
| 576 l10n_util::GetString(IDS_OPEN_FILE)); |
| 577 menu.AppendSeparator(); |
| 575 menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_BAR, | 578 menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_BAR, |
| 576 l10n_util::GetString(IDS_SHOW_BOOKMARK_BAR)); | 579 l10n_util::GetString(IDS_SHOW_BOOKMARK_BAR)); |
| 577 menu.AppendSeparator(); | 580 menu.AppendSeparator(); |
| 578 menu.AppendMenuItemWithLabel(IDC_SHOW_HISTORY, | 581 menu.AppendMenuItemWithLabel(IDC_SHOW_HISTORY, |
| 579 l10n_util::GetString(IDS_SHOW_HISTORY)); | 582 l10n_util::GetString(IDS_SHOW_HISTORY)); |
| 580 menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_MANAGER, | 583 menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_MANAGER, |
| 581 l10n_util::GetString(IDS_BOOKMARK_MANAGER)); | 584 l10n_util::GetString(IDS_BOOKMARK_MANAGER)); |
| 582 menu.AppendMenuItemWithLabel(IDC_SHOW_DOWNLOADS, | 585 menu.AppendMenuItemWithLabel(IDC_SHOW_DOWNLOADS, |
| 583 l10n_util::GetString(IDS_SHOW_DOWNLOADS)); | 586 l10n_util::GetString(IDS_SHOW_DOWNLOADS)); |
| 584 menu.AppendSeparator(); | 587 menu.AppendSeparator(); |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 *accel = views::Accelerator(L'C', false, true, false); | 778 *accel = views::Accelerator(L'C', false, true, false); |
| 776 return true; | 779 return true; |
| 777 case IDC_PASTE: | 780 case IDC_PASTE: |
| 778 *accel = views::Accelerator(L'V', false, true, false); | 781 *accel = views::Accelerator(L'V', false, true, false); |
| 779 return true; | 782 return true; |
| 780 } | 783 } |
| 781 // Else, we retrieve the accelerator information from the frame. | 784 // Else, we retrieve the accelerator information from the frame. |
| 782 return GetWidget()->GetAccelerator(id, accel); | 785 return GetWidget()->GetAccelerator(id, accel); |
| 783 } | 786 } |
| 784 | 787 |
| OLD | NEW |