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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
556 // Enumerate profiles asynchronously and then create the parent menu item. | 556 // Enumerate profiles asynchronously and then create the parent menu item. |
557 // We will create the child menu items for this once the asynchronous call is | 557 // We will create the child menu items for this once the asynchronous call is |
558 // done. See OnGetProfilesDone(). | 558 // done. See OnGetProfilesDone(). |
559 profiles_helper_->GetProfiles(NULL); | 559 profiles_helper_->GetProfiles(NULL); |
560 profiles_menu_ = menu.AppendSubMenu(IDC_PROFILE_MENU, | 560 profiles_menu_ = menu.AppendSubMenu(IDC_PROFILE_MENU, |
561 l10n_util::GetString(IDS_PROFILE_MENU)); | 561 l10n_util::GetString(IDS_PROFILE_MENU)); |
562 | 562 |
563 menu.AppendSeparator(); | 563 menu.AppendSeparator(); |
564 menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_BAR, | 564 menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_BAR, |
565 l10n_util::GetString(IDS_SHOW_BOOKMARK_BAR)); | 565 l10n_util::GetString(IDS_SHOW_BOOKMARK_BAR)); |
| 566 menu.AppendMenuItemWithLabel(IDC_FULLSCREEN, |
| 567 l10n_util::GetString(IDS_FULLSCREEN)); |
566 menu.AppendSeparator(); | 568 menu.AppendSeparator(); |
567 menu.AppendMenuItemWithLabel(IDC_SHOW_HISTORY, | 569 menu.AppendMenuItemWithLabel(IDC_SHOW_HISTORY, |
568 l10n_util::GetString(IDS_SHOW_HISTORY)); | 570 l10n_util::GetString(IDS_SHOW_HISTORY)); |
569 menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_MANAGER, | 571 menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_MANAGER, |
570 l10n_util::GetString(IDS_BOOKMARK_MANAGER)); | 572 l10n_util::GetString(IDS_BOOKMARK_MANAGER)); |
571 menu.AppendMenuItemWithLabel(IDC_SHOW_DOWNLOADS, | 573 menu.AppendMenuItemWithLabel(IDC_SHOW_DOWNLOADS, |
572 l10n_util::GetString(IDS_SHOW_DOWNLOADS)); | 574 l10n_util::GetString(IDS_SHOW_DOWNLOADS)); |
573 menu.AppendSeparator(); | 575 menu.AppendSeparator(); |
574 #ifdef CHROME_PERSONALIZATION | 576 #ifdef CHROME_PERSONALIZATION |
575 menu.AppendMenuItemWithLabel(IDC_P13N_INFO, | 577 menu.AppendMenuItemWithLabel(IDC_P13N_INFO, |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
795 *accel = views::Accelerator(L'C', false, true, false); | 797 *accel = views::Accelerator(L'C', false, true, false); |
796 return true; | 798 return true; |
797 case IDC_PASTE: | 799 case IDC_PASTE: |
798 *accel = views::Accelerator(L'V', false, true, false); | 800 *accel = views::Accelerator(L'V', false, true, false); |
799 return true; | 801 return true; |
800 } | 802 } |
801 // Else, we retrieve the accelerator information from the frame. | 803 // Else, we retrieve the accelerator information from the frame. |
802 return GetWidget()->GetAccelerator(id, accel); | 804 return GetWidget()->GetAccelerator(id, accel); |
803 } | 805 } |
804 | 806 |
OLD | NEW |