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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type) { | 353 Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type) { |
354 Browser* browser = new Browser( | 354 Browser* browser = new Browser( |
355 Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); | 355 Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); |
356 AddTabAt(browser, GURL(), -1, true); | 356 AddTabAt(browser, GURL(), -1, true); |
357 browser->window()->Show(); | 357 browser->window()->Show(); |
358 return browser; | 358 return browser; |
359 } | 359 } |
360 | 360 |
361 void OpenWindowWithRestoredTabs(Profile* profile, | 361 void OpenWindowWithRestoredTabs(Profile* profile, |
362 HostDesktopType host_desktop_type) { | 362 HostDesktopType host_desktop_type) { |
363 TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(profile); | 363 sessions::TabRestoreService* service = |
| 364 TabRestoreServiceFactory::GetForProfile(profile); |
364 if (service) | 365 if (service) |
365 service->RestoreMostRecentEntry(NULL, host_desktop_type); | 366 service->RestoreMostRecentEntry(NULL, host_desktop_type); |
366 } | 367 } |
367 | 368 |
368 void OpenURLOffTheRecord(Profile* profile, | 369 void OpenURLOffTheRecord(Profile* profile, |
369 const GURL& url, | 370 const GURL& url, |
370 chrome::HostDesktopType desktop_type) { | 371 chrome::HostDesktopType desktop_type) { |
371 ScopedTabbedBrowserDisplayer displayer(profile->GetOffTheRecordProfile(), | 372 ScopedTabbedBrowserDisplayer displayer(profile->GetOffTheRecordProfile(), |
372 desktop_type); | 373 desktop_type); |
373 AddSelectedTabWithURL(displayer.browser(), url, | 374 AddSelectedTabWithURL(displayer.browser(), url, |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
588 | 589 |
589 bool CanResetZoom(content::WebContents* contents) { | 590 bool CanResetZoom(content::WebContents* contents) { |
590 ui_zoom::ZoomController* zoom_controller = | 591 ui_zoom::ZoomController* zoom_controller = |
591 ui_zoom::ZoomController::FromWebContents(contents); | 592 ui_zoom::ZoomController::FromWebContents(contents); |
592 return !zoom_controller->IsAtDefaultZoom() || | 593 return !zoom_controller->IsAtDefaultZoom() || |
593 !zoom_controller->PageScaleFactorIsOne(); | 594 !zoom_controller->PageScaleFactorIsOne(); |
594 } | 595 } |
595 | 596 |
596 TabStripModelDelegate::RestoreTabType GetRestoreTabType( | 597 TabStripModelDelegate::RestoreTabType GetRestoreTabType( |
597 const Browser* browser) { | 598 const Browser* browser) { |
598 TabRestoreService* service = | 599 sessions::TabRestoreService* service = |
599 TabRestoreServiceFactory::GetForProfile(browser->profile()); | 600 TabRestoreServiceFactory::GetForProfile(browser->profile()); |
600 if (!service || service->entries().empty()) | 601 if (!service || service->entries().empty()) |
601 return TabStripModelDelegate::RESTORE_NONE; | 602 return TabStripModelDelegate::RESTORE_NONE; |
602 if (service->entries().front()->type == TabRestoreService::WINDOW) | 603 if (service->entries().front()->type == sessions::TabRestoreService::WINDOW) |
603 return TabStripModelDelegate::RESTORE_WINDOW; | 604 return TabStripModelDelegate::RESTORE_WINDOW; |
604 return TabStripModelDelegate::RESTORE_TAB; | 605 return TabStripModelDelegate::RESTORE_TAB; |
605 } | 606 } |
606 | 607 |
607 void SelectNextTab(Browser* browser) { | 608 void SelectNextTab(Browser* browser) { |
608 content::RecordAction(UserMetricsAction("SelectNextTab")); | 609 content::RecordAction(UserMetricsAction("SelectNextTab")); |
609 browser->tab_strip_model()->SelectNextTab(); | 610 browser->tab_strip_model()->SelectNextTab(); |
610 } | 611 } |
611 | 612 |
612 void SelectPreviousTab(Browser* browser) { | 613 void SelectPreviousTab(Browser* browser) { |
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1284 browser->host_desktop_type())); | 1285 browser->host_desktop_type())); |
1285 app_browser->tab_strip_model()->AppendWebContents(contents, true); | 1286 app_browser->tab_strip_model()->AppendWebContents(contents, true); |
1286 | 1287 |
1287 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; | 1288 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; |
1288 contents->GetRenderViewHost()->SyncRendererPrefs(); | 1289 contents->GetRenderViewHost()->SyncRendererPrefs(); |
1289 app_browser->window()->Show(); | 1290 app_browser->window()->Show(); |
1290 } | 1291 } |
1291 #endif // defined(ENABLE_EXTENSIONS) | 1292 #endif // defined(ENABLE_EXTENSIONS) |
1292 | 1293 |
1293 } // namespace chrome | 1294 } // namespace chrome |
OLD | NEW |