| Index: chrome/browser/browser.cc
|
| ===================================================================
|
| --- chrome/browser/browser.cc (revision 19223)
|
| +++ chrome/browser/browser.cc (working copy)
|
| @@ -1035,6 +1035,18 @@
|
| GetSelectedTabContents()->render_view_host()->Zoom(PageZoom::SMALLER);
|
| }
|
|
|
| +void Browser::ZoomTextOnlyIn() {
|
| + UserMetrics::RecordAction(L"ZoomTextOnlyPlus", profile_);
|
| + GetSelectedTabContents()->render_view_host()->Zoom(
|
| + PageZoom::TEXT_ONLY_LARGER);
|
| +}
|
| +
|
| +void Browser::ZoomTextOnlyOut() {
|
| + UserMetrics::RecordAction(L"ZoomTextOnlyMinus", profile_);
|
| + GetSelectedTabContents()->render_view_host()->Zoom(
|
| + PageZoom::TEXT_ONLY_SMALLER);
|
| +}
|
| +
|
| void Browser::FocusToolbar() {
|
| UserMetrics::RecordAction(L"FocusToolbar", profile_);
|
| window_->FocusToolbar();
|
| @@ -1324,9 +1336,11 @@
|
| case IDC_FIND_PREVIOUS: FindPrevious(); break;
|
|
|
| // Zoom
|
| + case IDC_ZOOM_TEXT_ONLY_PLUS: ZoomTextOnlyIn(); break;
|
| case IDC_ZOOM_PLUS: ZoomIn(); break;
|
| case IDC_ZOOM_NORMAL: ZoomReset(); break;
|
| case IDC_ZOOM_MINUS: ZoomOut(); break;
|
| + case IDC_ZOOM_TEXT_ONLY_MINUS: ZoomTextOnlyOut(); break;
|
|
|
| // Focus various bits of UI
|
| case IDC_FOCUS_TOOLBAR: FocusToolbar(); break;
|
| @@ -1822,8 +1836,28 @@
|
| GetStatusBubble()->UpdateDownloadShelfVisibility(visible);
|
| }
|
|
|
| -void Browser::ContentsZoomChange(bool zoom_in) {
|
| - ExecuteCommand(zoom_in ? IDC_ZOOM_PLUS : IDC_ZOOM_MINUS);
|
| +void Browser::ContentsZoomChange(PageZoom::Function zoom_type) {
|
| + int zoom_requested = -1;
|
| +
|
| + switch (zoom_type) {
|
| + case PageZoom::TEXT_ONLY_SMALLER :
|
| + zoom_requested = IDC_ZOOM_TEXT_ONLY_MINUS;
|
| + break;
|
| + case PageZoom::SMALLER :
|
| + zoom_requested = IDC_ZOOM_MINUS;
|
| + break;
|
| + case PageZoom::LARGER :
|
| + zoom_requested = IDC_ZOOM_PLUS;
|
| + break;
|
| + case PageZoom::TEXT_ONLY_LARGER :
|
| + zoom_requested = IDC_ZOOM_TEXT_ONLY_PLUS;
|
| + break;
|
| + default:
|
| + NOTREACHED();
|
| + return;
|
| + }
|
| +
|
| + ExecuteCommand(zoom_requested);
|
| }
|
|
|
| void Browser::TabContentsFocused(TabContents* tab_content) {
|
| @@ -2088,6 +2122,8 @@
|
| command_updater_.UpdateCommandEnabled(IDC_ZOOM_PLUS, true);
|
| command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true);
|
| command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true);
|
| + command_updater_.UpdateCommandEnabled(IDC_ZOOM_TEXT_ONLY_PLUS, true);
|
| + command_updater_.UpdateCommandEnabled(IDC_ZOOM_TEXT_ONLY_MINUS, true);
|
|
|
| // Show various bits of UI
|
| command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, true);
|
|
|