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

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

Issue 678343002: Default zoom was never read from chrome://settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed Zoom Update commands Created 5 years, 10 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_commands.h" 5 #include "chrome/browser/ui/browser_commands.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 } 561 }
562 562
563 void CloseTab(Browser* browser) { 563 void CloseTab(Browser* browser) {
564 content::RecordAction(UserMetricsAction("CloseTab_Accelerator")); 564 content::RecordAction(UserMetricsAction("CloseTab_Accelerator"));
565 browser->tab_strip_model()->CloseSelectedTabs(); 565 browser->tab_strip_model()->CloseSelectedTabs();
566 } 566 }
567 567
568 bool CanZoomIn(content::WebContents* contents) { 568 bool CanZoomIn(content::WebContents* contents) {
569 ui_zoom::ZoomController* zoom_controller = 569 ui_zoom::ZoomController* zoom_controller =
570 ui_zoom::ZoomController::FromWebContents(contents); 570 ui_zoom::ZoomController::FromWebContents(contents);
571 return zoom_controller->GetZoomPercent() != 571 return zoom_controller->GetZoomPercent() != contents->GetMaximumZoomPercent();
572 contents->GetMaximumZoomPercent() + 1;
573 } 572 }
574 573
575 bool CanZoomOut(content::WebContents* contents) { 574 bool CanZoomOut(content::WebContents* contents) {
576 ui_zoom::ZoomController* zoom_controller = 575 ui_zoom::ZoomController* zoom_controller =
577 ui_zoom::ZoomController::FromWebContents(contents); 576 ui_zoom::ZoomController::FromWebContents(contents);
578 return zoom_controller->GetZoomPercent() != 577 return zoom_controller->GetZoomPercent() !=
579 contents->GetMinimumZoomPercent(); 578 contents->GetMinimumZoomPercent();
580 } 579 }
581 580
582 bool ActualSize(content::WebContents* contents) { 581 bool IsAtDefaultZoom(content::WebContents* contents) {
583 ui_zoom::ZoomController* zoom_controller = 582 ui_zoom::ZoomController* zoom_controller =
584 ui_zoom::ZoomController::FromWebContents(contents); 583 ui_zoom::ZoomController::FromWebContents(contents);
585 return zoom_controller->GetZoomPercent() != 100.0f; 584 return zoom_controller->IsAtDefaultZoom();
586 } 585 }
587 586
588 TabStripModelDelegate::RestoreTabType GetRestoreTabType( 587 TabStripModelDelegate::RestoreTabType GetRestoreTabType(
589 const Browser* browser) { 588 const Browser* browser) {
590 TabRestoreService* service = 589 TabRestoreService* service =
591 TabRestoreServiceFactory::GetForProfile(browser->profile()); 590 TabRestoreServiceFactory::GetForProfile(browser->profile());
592 if (!service || service->entries().empty()) 591 if (!service || service->entries().empty())
593 return TabStripModelDelegate::RESTORE_NONE; 592 return TabStripModelDelegate::RESTORE_NONE;
594 if (service->entries().front()->type == TabRestoreService::WINDOW) 593 if (service->entries().front()->type == TabRestoreService::WINDOW)
595 return TabStripModelDelegate::RESTORE_WINDOW; 594 return TabStripModelDelegate::RESTORE_WINDOW;
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
1277 browser->host_desktop_type())); 1276 browser->host_desktop_type()));
1278 app_browser->tab_strip_model()->AppendWebContents(contents, true); 1277 app_browser->tab_strip_model()->AppendWebContents(contents, true);
1279 1278
1280 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 1279 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
1281 contents->GetRenderViewHost()->SyncRendererPrefs(); 1280 contents->GetRenderViewHost()->SyncRendererPrefs();
1282 app_browser->window()->Show(); 1281 app_browser->window()->Show();
1283 } 1282 }
1284 #endif // defined(ENABLE_EXTENSIONS) 1283 #endif // defined(ENABLE_EXTENSIONS)
1285 1284
1286 } // namespace chrome 1285 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698