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

Unified Diff: chrome/browser/ui/browser_commands.cc

Issue 10736037: Enable keyboard shortcuts and some menu commands for browserless Panels. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Zoom moved to chrome_page_zoom Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index d4f38896e89e2937e0af32caab426f29c7349405..24f1feb1699bc785fbcfe061fdc1aff80bdd4c76 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -703,54 +703,7 @@ void Zoom(Browser* browser, content::PageZoom zoom) {
if (browser->is_devtools())
return;
- content::RenderViewHost* host =
- GetActiveWebContents(browser)->GetRenderViewHost();
- if (zoom == content::PAGE_ZOOM_RESET) {
- host->SetZoomLevel(0);
- content::RecordAction(UserMetricsAction("ZoomNormal"));
- return;
- }
-
- double current_zoom_level = GetActiveWebContents(browser)->GetZoomLevel();
- double default_zoom_level =
- browser->profile()->GetPrefs()->GetDouble(prefs::kDefaultZoomLevel);
-
- // Generate a vector of zoom levels from an array of known presets along with
- // the default level added if necessary.
- std::vector<double> zoom_levels =
- chrome_page_zoom::PresetZoomLevels(default_zoom_level);
-
- if (zoom == content::PAGE_ZOOM_OUT) {
- // Iterate through the zoom levels in reverse order to find the next
- // lower level based on the current zoom level for this page.
- for (std::vector<double>::reverse_iterator i = zoom_levels.rbegin();
- i != zoom_levels.rend(); ++i) {
- double zoom_level = *i;
- if (content::ZoomValuesEqual(zoom_level, current_zoom_level))
- continue;
- if (zoom_level < current_zoom_level) {
- host->SetZoomLevel(zoom_level);
- content::RecordAction(UserMetricsAction("ZoomMinus"));
- return;
- }
- content::RecordAction(UserMetricsAction("ZoomMinus_AtMinimum"));
- }
- } else {
- // Iterate through the zoom levels in normal order to find the next
- // higher level based on the current zoom level for this page.
- for (std::vector<double>::const_iterator i = zoom_levels.begin();
- i != zoom_levels.end(); ++i) {
- double zoom_level = *i;
- if (content::ZoomValuesEqual(zoom_level, current_zoom_level))
- continue;
- if (zoom_level > current_zoom_level) {
- host->SetZoomLevel(zoom_level);
- content::RecordAction(UserMetricsAction("ZoomPlus"));
- return;
- }
- }
- content::RecordAction(UserMetricsAction("ZoomPlus_AtMaximum"));
- }
+ chrome_page_zoom::Zoom(GetActiveWebContents(browser), zoom);
}
void FocusToolbar(Browser* browser) {

Powered by Google App Engine
This is Rietveld 408576698