| OLD | NEW |
| 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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 // See http://crbug.com/6380. | 557 // See http://crbug.com/6380. |
| 558 b->tab_strip_model()->GetActiveWebContents()->RestoreFocus(); | 558 b->tab_strip_model()->GetActiveWebContents()->RestoreFocus(); |
| 559 } | 559 } |
| 560 } | 560 } |
| 561 | 561 |
| 562 void CloseTab(Browser* browser) { | 562 void CloseTab(Browser* browser) { |
| 563 content::RecordAction(UserMetricsAction("CloseTab_Accelerator")); | 563 content::RecordAction(UserMetricsAction("CloseTab_Accelerator")); |
| 564 browser->tab_strip_model()->CloseSelectedTabs(); | 564 browser->tab_strip_model()->CloseSelectedTabs(); |
| 565 } | 565 } |
| 566 | 566 |
| 567 bool CanZoomIn(content::WebContents* contents) { | 567 bool IsAtMaximumZoom(content::WebContents* contents) { |
| 568 ui_zoom::ZoomController* zoom_controller = | 568 ui_zoom::ZoomController* zoom_controller = |
| 569 ui_zoom::ZoomController::FromWebContents(contents); | 569 ui_zoom::ZoomController::FromWebContents(contents); |
| 570 return zoom_controller->GetZoomPercent() != | 570 return zoom_controller->GetZoomPercent() != contents->GetMaximumZoomPercent(); |
| 571 contents->GetMaximumZoomPercent() + 1; | |
| 572 } | 571 } |
| 573 | 572 |
| 574 bool CanZoomOut(content::WebContents* contents) { | 573 bool IsAtMinimumZoom(content::WebContents* contents) { |
| 575 ui_zoom::ZoomController* zoom_controller = | 574 ui_zoom::ZoomController* zoom_controller = |
| 576 ui_zoom::ZoomController::FromWebContents(contents); | 575 ui_zoom::ZoomController::FromWebContents(contents); |
| 577 return zoom_controller->GetZoomPercent() != | 576 return zoom_controller->GetZoomPercent() != |
| 578 contents->GetMinimumZoomPercent(); | 577 contents->GetMinimumZoomPercent(); |
| 579 } | 578 } |
| 580 | 579 |
| 581 bool ActualSize(content::WebContents* contents) { | 580 bool IsAtDefaultZoom(content::WebContents* contents) { |
| 582 ui_zoom::ZoomController* zoom_controller = | 581 ui_zoom::ZoomController* zoom_controller = |
| 583 ui_zoom::ZoomController::FromWebContents(contents); | 582 ui_zoom::ZoomController::FromWebContents(contents); |
| 584 return zoom_controller->GetZoomPercent() != 100.0f; | 583 return zoom_controller->IsAtDefaultZoom(); |
| 585 } | 584 } |
| 586 | 585 |
| 587 TabStripModelDelegate::RestoreTabType GetRestoreTabType( | 586 TabStripModelDelegate::RestoreTabType GetRestoreTabType( |
| 588 const Browser* browser) { | 587 const Browser* browser) { |
| 589 TabRestoreService* service = | 588 TabRestoreService* service = |
| 590 TabRestoreServiceFactory::GetForProfile(browser->profile()); | 589 TabRestoreServiceFactory::GetForProfile(browser->profile()); |
| 591 if (!service || service->entries().empty()) | 590 if (!service || service->entries().empty()) |
| 592 return TabStripModelDelegate::RESTORE_NONE; | 591 return TabStripModelDelegate::RESTORE_NONE; |
| 593 if (service->entries().front()->type == TabRestoreService::WINDOW) | 592 if (service->entries().front()->type == TabRestoreService::WINDOW) |
| 594 return TabStripModelDelegate::RESTORE_WINDOW; | 593 return TabStripModelDelegate::RESTORE_WINDOW; |
| (...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1275 browser->host_desktop_type())); | 1274 browser->host_desktop_type())); |
| 1276 app_browser->tab_strip_model()->AppendWebContents(contents, true); | 1275 app_browser->tab_strip_model()->AppendWebContents(contents, true); |
| 1277 | 1276 |
| 1278 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; | 1277 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; |
| 1279 contents->GetRenderViewHost()->SyncRendererPrefs(); | 1278 contents->GetRenderViewHost()->SyncRendererPrefs(); |
| 1280 app_browser->window()->Show(); | 1279 app_browser->window()->Show(); |
| 1281 } | 1280 } |
| 1282 #endif // defined(ENABLE_EXTENSIONS) | 1281 #endif // defined(ENABLE_EXTENSIONS) |
| 1283 | 1282 |
| 1284 } // namespace chrome | 1283 } // namespace chrome |
| OLD | NEW |