| 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 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1012 | 1012 |
| 1013 encoding_menu_contents_.reset(new EncodingMenuModel(browser_)); | 1013 encoding_menu_contents_.reset(new EncodingMenuModel(browser_)); |
| 1014 page_menu_contents_->AddSubMenuWithStringId( | 1014 page_menu_contents_->AddSubMenuWithStringId( |
| 1015 IDS_ENCODING_MENU, encoding_menu_contents_.get()); | 1015 IDS_ENCODING_MENU, encoding_menu_contents_.get()); |
| 1016 | 1016 |
| 1017 #if defined(OS_WIN) | 1017 #if defined(OS_WIN) |
| 1018 CreateDevToolsMenuContents(); | 1018 CreateDevToolsMenuContents(); |
| 1019 page_menu_contents_->AddSeparator(); | 1019 page_menu_contents_->AddSeparator(); |
| 1020 page_menu_contents_->AddSubMenuWithStringId( | 1020 page_menu_contents_->AddSubMenuWithStringId( |
| 1021 IDS_DEVELOPER_MENU, devtools_menu_contents_.get()); | 1021 IDS_DEVELOPER_MENU, devtools_menu_contents_.get()); |
| 1022 #endif | |
| 1023 | 1022 |
| 1024 page_menu_contents_->AddSeparator(); | 1023 page_menu_contents_->AddSeparator(); |
| 1025 page_menu_contents_->AddItemWithStringId(IDC_REPORT_BUG, IDS_REPORT_BUG); | 1024 page_menu_contents_->AddItemWithStringId(IDC_REPORT_BUG, IDS_REPORT_BUG); |
| 1025 #else |
| 1026 NOTIMPLEMENTED(); |
| 1027 #endif |
| 1026 | 1028 |
| 1027 page_menu_menu_.reset(new views::Menu2(page_menu_contents_.get())); | 1029 page_menu_menu_.reset(new views::Menu2(page_menu_contents_.get())); |
| 1028 } | 1030 } |
| 1029 | 1031 |
| 1030 #if defined(OS_WIN) | 1032 #if defined(OS_WIN) |
| 1031 void ToolbarView::CreateDevToolsMenuContents() { | 1033 void ToolbarView::CreateDevToolsMenuContents() { |
| 1032 devtools_menu_contents_.reset(new views::SimpleMenuModel(this)); | 1034 devtools_menu_contents_.reset(new views::SimpleMenuModel(this)); |
| 1033 devtools_menu_contents_->AddItem(IDC_VIEW_SOURCE, | 1035 devtools_menu_contents_->AddItem(IDC_VIEW_SOURCE, |
| 1034 l10n_util::GetString(IDS_VIEW_SOURCE)); | 1036 l10n_util::GetString(IDS_VIEW_SOURCE)); |
| 1035 if (g_browser_process->have_inspector_files()) { | 1037 if (g_browser_process->have_inspector_files()) { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1086 app_menu_contents_->AddItem(IDC_ABOUT, | 1088 app_menu_contents_->AddItem(IDC_ABOUT, |
| 1087 l10n_util::GetStringFUTF16( | 1089 l10n_util::GetStringFUTF16( |
| 1088 IDS_ABOUT, | 1090 IDS_ABOUT, |
| 1089 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 1091 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |
| 1090 app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); | 1092 app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); |
| 1091 app_menu_contents_->AddSeparator(); | 1093 app_menu_contents_->AddSeparator(); |
| 1092 app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); | 1094 app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); |
| 1093 | 1095 |
| 1094 app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); | 1096 app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); |
| 1095 } | 1097 } |
| OLD | NEW |