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

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

Issue 2200993004: Make TabRestoreService::Entry noncopyable and fix up surrounding code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tab-test-cleanup
Patch Set: Add back NOTREACHED() and a return for gcc Created 4 years, 4 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/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 return !zoom_controller->IsAtDefaultZoom() || 596 return !zoom_controller->IsAtDefaultZoom() ||
597 !zoom_controller->PageScaleFactorIsOne(); 597 !zoom_controller->PageScaleFactorIsOne();
598 } 598 }
599 599
600 TabStripModelDelegate::RestoreTabType GetRestoreTabType( 600 TabStripModelDelegate::RestoreTabType GetRestoreTabType(
601 const Browser* browser) { 601 const Browser* browser) {
602 sessions::TabRestoreService* service = 602 sessions::TabRestoreService* service =
603 TabRestoreServiceFactory::GetForProfile(browser->profile()); 603 TabRestoreServiceFactory::GetForProfile(browser->profile());
604 if (!service || service->entries().empty()) 604 if (!service || service->entries().empty())
605 return TabStripModelDelegate::RESTORE_NONE; 605 return TabStripModelDelegate::RESTORE_NONE;
606 if (service->entries().front()->type == sessions::TabRestoreService::WINDOW) 606 if (service->entries().front()->type() == sessions::TabRestoreService::WINDOW)
607 return TabStripModelDelegate::RESTORE_WINDOW; 607 return TabStripModelDelegate::RESTORE_WINDOW;
608 return TabStripModelDelegate::RESTORE_TAB; 608 return TabStripModelDelegate::RESTORE_TAB;
609 } 609 }
610 610
611 void SelectNextTab(Browser* browser) { 611 void SelectNextTab(Browser* browser) {
612 content::RecordAction(UserMetricsAction("SelectNextTab")); 612 content::RecordAction(UserMetricsAction("SelectNextTab"));
613 browser->tab_strip_model()->SelectNextTab(); 613 browser->tab_strip_model()->SelectNextTab();
614 } 614 }
615 615
616 void SelectPreviousTab(Browser* browser) { 616 void SelectPreviousTab(Browser* browser) {
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 app_name, true /* trusted_source */, gfx::Rect(), browser->profile())); 1290 app_name, true /* trusted_source */, gfx::Rect(), browser->profile()));
1291 app_browser->tab_strip_model()->AppendWebContents(contents, true); 1291 app_browser->tab_strip_model()->AppendWebContents(contents, true);
1292 1292
1293 contents->GetMutableRendererPrefs()->can_accept_load_drops = false; 1293 contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
1294 contents->GetRenderViewHost()->SyncRendererPrefs(); 1294 contents->GetRenderViewHost()->SyncRendererPrefs();
1295 app_browser->window()->Show(); 1295 app_browser->window()->Show();
1296 } 1296 }
1297 #endif // defined(ENABLE_EXTENSIONS) 1297 #endif // defined(ENABLE_EXTENSIONS)
1298 1298
1299 } // namespace chrome 1299 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698