summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc21
1 files changed, 1 insertions, 20 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 13bfbc1..db21f8a 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -2728,9 +2728,6 @@ void Browser::LoadingStateChanged(TabContents* source) {
GetSelectedTabContents()->GetStatusText()));
}
- if (source->is_loading())
- UpdateZoomCommandsForTabState();
-
if (!source->is_loading() &&
pending_web_app_action_ == UPDATE_SHORTCUT) {
// Schedule a shortcut update when web application info is available if
@@ -2831,9 +2828,7 @@ bool Browser::UseVerticalTabs() const {
}
void Browser::ContentsZoomChange(bool zoom_in) {
- int command_id = zoom_in ? IDC_ZOOM_PLUS : IDC_ZOOM_MINUS;
- if (command_updater_.IsCommandEnabled(command_id))
- ExecuteCommand(command_id);
+ ExecuteCommand(zoom_in ? IDC_ZOOM_PLUS : IDC_ZOOM_MINUS);
}
void Browser::OnContentSettingsChange(TabContents* source) {
@@ -3066,11 +3061,6 @@ void Browser::OnDidGetApplicationInfo(TabContents* tab_contents,
pending_web_app_action_ = NONE;
}
-void Browser::ContentTypeChanged(TabContents* source) {
- if (source == GetSelectedTabContents())
- UpdateZoomCommandsForTabState();
-}
-
///////////////////////////////////////////////////////////////////////////////
// Browser, SelectFileDialog::Listener implementation:
@@ -3485,15 +3475,6 @@ void Browser::UpdateCommandsForTabState() {
command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS,
web_app::IsValidUrl(current_tab->GetURL()));
#endif
- UpdateZoomCommandsForTabState();
-}
-
-void Browser::UpdateZoomCommandsForTabState() {
- // Disable zoom commands for PDF content.
- bool enable_zoom = !GetSelectedTabContents()->is_displaying_pdf_content();
- command_updater_.UpdateCommandEnabled(IDC_ZOOM_PLUS, enable_zoom);
- command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, enable_zoom);
- command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, enable_zoom);
}
void Browser::UpdateReloadStopState(bool is_loading, bool force) {