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

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

Issue 305243002: Replace usage of GetActiveEntry with GetLastCommittedEntry in chrome/browser/ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes based on pkasting's review. Created 6 years, 6 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
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/browser_commands.cc » ('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 "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 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
1093 window()->ZoomChangedForActiveTab(false); 1093 window()->ZoomChangedForActiveTab(false);
1094 command_updater_.UpdateCommandEnabled(IDC_VIEW_SOURCE, 1094 command_updater_.UpdateCommandEnabled(IDC_VIEW_SOURCE,
1095 CanViewSource(browser_)); 1095 CanViewSource(browser_));
1096 command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION, 1096 command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION,
1097 CanEmailPageLocation(browser_)); 1097 CanEmailPageLocation(browser_));
1098 if (browser_->is_devtools()) 1098 if (browser_->is_devtools())
1099 command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, false); 1099 command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, false);
1100 1100
1101 // Changing the encoding is not possible on Chrome-internal webpages. 1101 // Changing the encoding is not possible on Chrome-internal webpages.
1102 NavigationController& nc = current_web_contents->GetController(); 1102 NavigationController& nc = current_web_contents->GetController();
1103 bool is_chrome_internal = HasInternalURL(nc.GetActiveEntry()) || 1103 bool is_chrome_internal = HasInternalURL(nc.GetLastCommittedEntry()) ||
1104 current_web_contents->ShowingInterstitialPage(); 1104 current_web_contents->ShowingInterstitialPage();
1105 command_updater_.UpdateCommandEnabled(IDC_ENCODING_MENU, 1105 command_updater_.UpdateCommandEnabled(IDC_ENCODING_MENU,
1106 !is_chrome_internal && current_web_contents->IsSavable()); 1106 !is_chrome_internal && current_web_contents->IsSavable());
1107 1107
1108 // Show various bits of UI 1108 // Show various bits of UI
1109 // TODO(pinkerton): Disable app-mode in the model until we implement it 1109 // TODO(pinkerton): Disable app-mode in the model until we implement it
1110 // on the Mac. Be sure to remove both ifdefs. http://crbug.com/13148 1110 // on the Mac. Be sure to remove both ifdefs. http://crbug.com/13148
1111 #if !defined(OS_MACOSX) 1111 #if !defined(OS_MACOSX)
1112 command_updater_.UpdateCommandEnabled( 1112 command_updater_.UpdateCommandEnabled(
1113 IDC_CREATE_SHORTCUTS, 1113 IDC_CREATE_SHORTCUTS,
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
1328 1328
1329 BrowserWindow* BrowserCommandController::window() { 1329 BrowserWindow* BrowserCommandController::window() {
1330 return browser_->window(); 1330 return browser_->window();
1331 } 1331 }
1332 1332
1333 Profile* BrowserCommandController::profile() { 1333 Profile* BrowserCommandController::profile() {
1334 return browser_->profile(); 1334 return browser_->profile();
1335 } 1335 }
1336 1336
1337 } // namespace chrome 1337 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698