Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(503)

Unified Diff: chrome/browser/ui/views/frame/browser_frame_win.cc

Issue 10837317: Setting the touch wrench menu as default menu for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: And another merge! Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_aura.cc ('k') | chrome/browser/ui/views/menu_item_view_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_frame_win.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc
index 6e03e5be83fe2db8138cf9ee04a2932e5e56bd35..e6c3e582cfdaa3412662ecf665cc224ab8a4c4c7 100644
--- a/chrome/browser/ui/views/frame/browser_frame_win.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_win.cc
@@ -443,13 +443,13 @@ void BrowserFrameWin::UpdateDWMFrame() {
}
void BrowserFrameWin::BuildSystemMenuForBrowserWindow() {
- system_menu_contents_->AddSeparator();
+ system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
if (chrome::CanOpenTaskManager()) {
system_menu_contents_->AddItemWithStringId(IDC_TASK_MANAGER,
IDS_TASK_MANAGER);
}
- system_menu_contents_->AddSeparator();
+ system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
system_menu_contents_->AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
system_menu_contents_->AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
AddFrameToggleItems();
@@ -460,11 +460,11 @@ void BrowserFrameWin::BuildSystemMenuForBrowserWindow() {
void BrowserFrameWin::BuildSystemMenuForAppOrPopupWindow() {
Browser* browser = browser_view()->browser();
if (browser->is_app() && chrome::CanOpenTaskManager()) {
- system_menu_contents_->AddSeparator();
+ system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
system_menu_contents_->AddItemWithStringId(IDC_TASK_MANAGER,
IDS_TASK_MANAGER);
}
- system_menu_contents_->AddSeparator();
+ system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
encoding_menu_contents_.reset(new EncodingMenuModel(browser));
system_menu_contents_->AddSubMenuWithStringId(IDC_ENCODING_MENU,
IDS_ENCODING_MENU,
@@ -474,11 +474,11 @@ void BrowserFrameWin::BuildSystemMenuForAppOrPopupWindow() {
zoom_menu_contents_.get());
system_menu_contents_->AddItemWithStringId(IDC_PRINT, IDS_PRINT);
system_menu_contents_->AddItemWithStringId(IDC_FIND, IDS_FIND);
- system_menu_contents_->AddSeparator();
+ system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
system_menu_contents_->AddItemWithStringId(IDC_PASTE, IDS_PASTE);
system_menu_contents_->AddItemWithStringId(IDC_COPY, IDS_COPY);
system_menu_contents_->AddItemWithStringId(IDC_CUT, IDS_CUT);
- system_menu_contents_->AddSeparator();
+ system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
if (browser->is_app()) {
system_menu_contents_->AddItemWithStringId(IDC_NEW_TAB,
IDS_APP_MENU_NEW_WEB_PAGE);
@@ -486,7 +486,7 @@ void BrowserFrameWin::BuildSystemMenuForAppOrPopupWindow() {
system_menu_contents_->AddItemWithStringId(IDC_SHOW_AS_TAB,
IDS_SHOW_AS_TAB);
}
- system_menu_contents_->AddSeparator();
+ system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
system_menu_contents_->AddItemWithStringId(IDC_RELOAD, IDS_APP_MENU_RELOAD);
system_menu_contents_->AddItemWithStringId(IDC_FORWARD,
IDS_CONTENT_CONTEXT_FORWARD);
@@ -498,7 +498,7 @@ void BrowserFrameWin::BuildSystemMenuForAppOrPopupWindow() {
void BrowserFrameWin::AddFrameToggleItems() {
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDebugEnableFrameToggle)) {
- system_menu_contents_->AddSeparator();
+ system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
system_menu_contents_->AddItem(IDC_DEBUG_FRAME_TOGGLE,
L"Toggle Frame Type");
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_aura.cc ('k') | chrome/browser/ui/views/menu_item_view_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698