| 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 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1082 app_menu_contents_->AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY); | 1082 app_menu_contents_->AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY); |
| 1083 app_menu_contents_->AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, | 1083 app_menu_contents_->AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, |
| 1084 IDS_BOOKMARK_MANAGER); | 1084 IDS_BOOKMARK_MANAGER); |
| 1085 app_menu_contents_->AddItemWithStringId(IDC_SHOW_DOWNLOADS, | 1085 app_menu_contents_->AddItemWithStringId(IDC_SHOW_DOWNLOADS, |
| 1086 IDS_SHOW_DOWNLOADS); | 1086 IDS_SHOW_DOWNLOADS); |
| 1087 app_menu_contents_->AddSeparator(); | 1087 app_menu_contents_->AddSeparator(); |
| 1088 #ifdef CHROME_PERSONALIZATION | 1088 #ifdef CHROME_PERSONALIZATION |
| 1089 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync)) { | 1089 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync)) { |
| 1090 app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, | 1090 app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, |
| 1091 l10n_util::GetString(IDS_SYNC_MENU_LABEL)); | 1091 l10n_util::GetString(IDS_SYNC_MENU_LABEL)); |
| 1092 app_menu_contents_->AddSeparator(); |
| 1092 } | 1093 } |
| 1093 app_menu_contents_->AddSeparator(); | |
| 1094 #endif | 1094 #endif |
| 1095 app_menu_contents_->AddItem(IDC_OPTIONS, | 1095 app_menu_contents_->AddItem(IDC_OPTIONS, |
| 1096 l10n_util::GetStringFUTF16( | 1096 l10n_util::GetStringFUTF16( |
| 1097 IDS_OPTIONS, | 1097 IDS_OPTIONS, |
| 1098 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 1098 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |
| 1099 app_menu_contents_->AddItem(IDC_ABOUT, | 1099 app_menu_contents_->AddItem(IDC_ABOUT, |
| 1100 l10n_util::GetStringFUTF16( | 1100 l10n_util::GetStringFUTF16( |
| 1101 IDS_ABOUT, | 1101 IDS_ABOUT, |
| 1102 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 1102 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |
| 1103 app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); | 1103 app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); |
| 1104 app_menu_contents_->AddSeparator(); | 1104 app_menu_contents_->AddSeparator(); |
| 1105 app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); | 1105 app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); |
| 1106 | 1106 |
| 1107 app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); | 1107 app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); |
| 1108 } | 1108 } |
| OLD | NEW |