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

Side by Side Diff: chrome/browser/ui/browser_command_controller.cc

Issue 883603002: Rename StreamlinedHostedApps to NewBookmarkApps in the code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments and variables Created 5 years, 11 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser_command_controller.h" 5 #include "chrome/browser/ui/browser_command_controller.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
971 // Chrome OS uses the system tray menu to handle multi-profiles. 971 // Chrome OS uses the system tray menu to handle multi-profiles.
972 if (normal_window && (guest_session || !profile()->IsOffTheRecord())) 972 if (normal_window && (guest_session || !profile()->IsOffTheRecord()))
973 command_updater_.UpdateCommandEnabled(IDC_SHOW_AVATAR_MENU, true); 973 command_updater_.UpdateCommandEnabled(IDC_SHOW_AVATAR_MENU, true);
974 #endif 974 #endif
975 975
976 UpdateShowSyncState(true); 976 UpdateShowSyncState(true);
977 977
978 // Navigation commands 978 // Navigation commands
979 command_updater_.UpdateCommandEnabled( 979 command_updater_.UpdateCommandEnabled(
980 IDC_HOME, 980 IDC_HOME,
981 normal_window || (extensions::util::IsStreamlinedHostedAppsEnabled() && 981 normal_window ||
982 browser_->is_app())); 982 (extensions::util::IsNewBookmarkAppsEnabled() && browser_->is_app()));
983 983
984 // Window management commands 984 // Window management commands
985 command_updater_.UpdateCommandEnabled(IDC_SELECT_NEXT_TAB, normal_window); 985 command_updater_.UpdateCommandEnabled(IDC_SELECT_NEXT_TAB, normal_window);
986 command_updater_.UpdateCommandEnabled(IDC_SELECT_PREVIOUS_TAB, 986 command_updater_.UpdateCommandEnabled(IDC_SELECT_PREVIOUS_TAB,
987 normal_window); 987 normal_window);
988 command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_NEXT, normal_window); 988 command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_NEXT, normal_window);
989 command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_PREVIOUS, normal_window); 989 command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_PREVIOUS, normal_window);
990 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_0, normal_window); 990 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_0, normal_window);
991 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_1, normal_window); 991 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_1, normal_window);
992 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_2, normal_window); 992 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_2, normal_window);
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1346 1346
1347 BrowserWindow* BrowserCommandController::window() { 1347 BrowserWindow* BrowserCommandController::window() {
1348 return browser_->window(); 1348 return browser_->window();
1349 } 1349 }
1350 1350
1351 Profile* BrowserCommandController::profile() { 1351 Profile* BrowserCommandController::profile() {
1352 return browser_->profile(); 1352 return browser_->profile();
1353 } 1353 }
1354 1354
1355 } // namespace chrome 1355 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698