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

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

Issue 11073009: Include individual share intents in the action box and allow direct triggering without an intermedi… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: addressing review nits Created 8 years, 2 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/browser_commands.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/defaults.h" 9 #include "chrome/browser/defaults.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 Exit(); 437 Exit();
438 break; 438 break;
439 439
440 // Page-related commands 440 // Page-related commands
441 case IDC_SAVE_PAGE: 441 case IDC_SAVE_PAGE:
442 SavePage(browser_); 442 SavePage(browser_);
443 break; 443 break;
444 case IDC_BOOKMARK_PAGE: 444 case IDC_BOOKMARK_PAGE:
445 BookmarkCurrentPage(browser_); 445 BookmarkCurrentPage(browser_);
446 break; 446 break;
447 case IDC_SHARE_PAGE:
448 ShareCurrentPage(browser_);
449 break;
450 case IDC_PIN_TO_START_SCREEN: 447 case IDC_PIN_TO_START_SCREEN:
451 TogglePagePinnedToStartScreen(browser_); 448 TogglePagePinnedToStartScreen(browser_);
452 break; 449 break;
453 case IDC_BOOKMARK_ALL_TABS: 450 case IDC_BOOKMARK_ALL_TABS:
454 BookmarkAllTabs(browser_); 451 BookmarkAllTabs(browser_);
455 break; 452 break;
456 case IDC_VIEW_SOURCE: 453 case IDC_VIEW_SOURCE:
457 ViewSelectedSource(browser_); 454 ViewSelectedSource(browser_);
458 break; 455 break;
459 case IDC_EMAIL_PAGE_LOCATION: 456 case IDC_EMAIL_PAGE_LOCATION:
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885910, true); 826 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885910, true);
830 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885914, true); 827 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885914, true);
831 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885916, true); 828 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO885916, true);
832 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1254, true); 829 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1254, true);
833 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88596, true); 830 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88596, true);
834 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1256, true); 831 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1256, true);
835 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88598, true); 832 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88598, true);
836 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88598I, true); 833 command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88598I, true);
837 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1255, true); 834 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1255, true);
838 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1258, true); 835 command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1258, true);
839 command_updater_.UpdateCommandEnabled(IDC_SHARE_PAGE, true);
840 836
841 // Zoom 837 // Zoom
842 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MENU, true); 838 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MENU, true);
843 command_updater_.UpdateCommandEnabled(IDC_ZOOM_PLUS, true); 839 command_updater_.UpdateCommandEnabled(IDC_ZOOM_PLUS, true);
844 command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true); 840 command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true);
845 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true); 841 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true);
846 842
847 // Show various bits of UI 843 // Show various bits of UI
848 UpdateOpenFileState(); 844 UpdateOpenFileState();
849 command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false); 845 command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 1178
1183 BrowserWindow* BrowserCommandController::window() { 1179 BrowserWindow* BrowserCommandController::window() {
1184 return browser_->window(); 1180 return browser_->window();
1185 } 1181 }
1186 1182
1187 Profile* BrowserCommandController::profile() { 1183 Profile* BrowserCommandController::profile() {
1188 return browser_->profile(); 1184 return browser_->profile();
1189 } 1185 }
1190 1186
1191 } // namespace chrome 1187 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/browser_commands.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698