| 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 #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 "app/drag_drop_types.h" | 9 #include "app/drag_drop_types.h" |
| 10 #include "app/gfx/canvas.h" | 10 #include "app/gfx/canvas.h" |
| (...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1059 app_menu_contents_->AddSeparator(); | 1059 app_menu_contents_->AddSeparator(); |
| 1060 app_menu_contents_->AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY); | 1060 app_menu_contents_->AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY); |
| 1061 app_menu_contents_->AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, | 1061 app_menu_contents_->AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, |
| 1062 IDS_BOOKMARK_MANAGER); | 1062 IDS_BOOKMARK_MANAGER); |
| 1063 app_menu_contents_->AddItemWithStringId(IDC_SHOW_DOWNLOADS, | 1063 app_menu_contents_->AddItemWithStringId(IDC_SHOW_DOWNLOADS, |
| 1064 IDS_SHOW_DOWNLOADS); | 1064 IDS_SHOW_DOWNLOADS); |
| 1065 app_menu_contents_->AddSeparator(); | 1065 app_menu_contents_->AddSeparator(); |
| 1066 #ifdef CHROME_PERSONALIZATION | 1066 #ifdef CHROME_PERSONALIZATION |
| 1067 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync)) { | 1067 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync)) { |
| 1068 app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, | 1068 app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, |
| 1069 l10n_util::GetString(IDS_SYNC_MENU_LABEL)); | 1069 l10n_util::GetString(IDS_SYNC_MY_BOOKMARKS_LABEL) + L"..."); |
| 1070 app_menu_contents_->AddSeparator(); | 1070 app_menu_contents_->AddSeparator(); |
| 1071 } | 1071 } |
| 1072 #endif | 1072 #endif |
| 1073 app_menu_contents_->AddItem(IDC_OPTIONS, | 1073 app_menu_contents_->AddItem(IDC_OPTIONS, |
| 1074 l10n_util::GetStringFUTF16( | 1074 l10n_util::GetStringFUTF16( |
| 1075 IDS_OPTIONS, | 1075 IDS_OPTIONS, |
| 1076 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 1076 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |
| 1077 app_menu_contents_->AddItem(IDC_ABOUT, | 1077 app_menu_contents_->AddItem(IDC_ABOUT, |
| 1078 l10n_util::GetStringFUTF16( | 1078 l10n_util::GetStringFUTF16( |
| 1079 IDS_ABOUT, | 1079 IDS_ABOUT, |
| 1080 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 1080 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |
| 1081 app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); | 1081 app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); |
| 1082 app_menu_contents_->AddSeparator(); | 1082 app_menu_contents_->AddSeparator(); |
| 1083 app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); | 1083 app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); |
| 1084 | 1084 |
| 1085 app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); | 1085 app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); |
| 1086 } | 1086 } |
| OLD | NEW |