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

Side by Side Diff: chrome/browser/ui/views/frame/system_menu_model_builder.cc

Issue 146363002: Linux Aura: Use system title bar is now set by preference, not flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename BrowserView pref registration functions. Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/ui/views/frame/system_menu_model_builder.h" 5 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/ui/browser_commands.h" 10 #include "chrome/browser/ui/browser_commands.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 58
59 void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( 59 void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
60 ui::SimpleMenuModel* model) { 60 ui::SimpleMenuModel* model) {
61 model->AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB); 61 model->AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
62 model->AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); 62 model->AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
63 if (chrome::CanOpenTaskManager()) { 63 if (chrome::CanOpenTaskManager()) {
64 model->AddSeparator(ui::NORMAL_SEPARATOR); 64 model->AddSeparator(ui::NORMAL_SEPARATOR);
65 model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); 65 model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
66 } 66 }
67 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
68 model->AddSeparator(ui::NORMAL_SEPARATOR);
69 model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
70 IDS_SHOW_WINDOW_DECORATIONS_MENU);
71 #endif
67 AppendTeleportMenu(model); 72 AppendTeleportMenu(model);
68 // If it's a regular browser window with tabs, we don't add any more items, 73 // If it's a regular browser window with tabs, we don't add any more items,
69 // since it already has menus (Page, Chrome). 74 // since it already has menus (Page, Chrome).
70 } 75 }
71 76
72 void SystemMenuModelBuilder::BuildSystemMenuForAppOrPopupWindow( 77 void SystemMenuModelBuilder::BuildSystemMenuForAppOrPopupWindow(
73 ui::SimpleMenuModel* model) { 78 ui::SimpleMenuModel* model) {
74 model->AddItemWithStringId(IDC_BACK, IDS_CONTENT_CONTEXT_BACK); 79 model->AddItemWithStringId(IDC_BACK, IDS_CONTENT_CONTEXT_BACK);
75 model->AddItemWithStringId(IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD); 80 model->AddItemWithStringId(IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD);
76 model->AddItemWithStringId(IDC_RELOAD, IDS_APP_MENU_RELOAD); 81 model->AddItemWithStringId(IDC_RELOAD, IDS_APP_MENU_RELOAD);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 model->AddItem( 150 model->AddItem(
146 user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2 : 151 user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2 :
147 IDC_VISIT_DESKTOP_OF_LRU_USER_3, 152 IDC_VISIT_DESKTOP_OF_LRU_USER_3,
148 l10n_util::GetStringFUTF16( 153 l10n_util::GetStringFUTF16(
149 IDS_VISIT_DESKTOP_OF_LRU_USER, 154 IDS_VISIT_DESKTOP_OF_LRU_USER,
150 delegate->GetUserDisplayName(user_index), 155 delegate->GetUserDisplayName(user_index),
151 base::ASCIIToUTF16(delegate->GetUserEmail(user_index)))); 156 base::ASCIIToUTF16(delegate->GetUserEmail(user_index))));
152 } 157 }
153 #endif 158 #endif
154 } 159 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698