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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 111253003: Remove DeferBackgroundExtensionCreation field trial and supporting code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: extension_system.h header still needed for GetDisabledPlatformApp Created 7 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/startup/startup_browser_creator_impl.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_restore_service.h" 10 #include "apps/app_restore_service.h"
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 KeystoneInfoBar::PromotionInfoBar(profile); 411 KeystoneInfoBar::PromotionInfoBar(profile);
412 } 412 }
413 #endif 413 #endif
414 } 414 }
415 415
416 #if defined(OS_WIN) 416 #if defined(OS_WIN)
417 if (process_startup) 417 if (process_startup)
418 ShellIntegration::MigrateChromiumShortcuts(); 418 ShellIntegration::MigrateChromiumShortcuts();
419 #endif // defined(OS_WIN) 419 #endif // defined(OS_WIN)
420 420
421 #if defined(ENABLE_EXTENSIONS)
422 // If we deferred creation of background extension hosts, we want to create
423 // them now that the session (if any) has been restored.
424 extensions::ProcessManager* process_manager =
425 extensions::ExtensionSystem::Get(profile)->process_manager();
426 process_manager->DeferBackgroundHostCreation(false);
427 #endif
428
429 return true; 421 return true;
430 } 422 }
431 423
432 void StartupBrowserCreatorImpl::ExtractOptionalAppWindowSize( 424 void StartupBrowserCreatorImpl::ExtractOptionalAppWindowSize(
433 gfx::Rect* bounds) { 425 gfx::Rect* bounds) {
434 if (command_line_.HasSwitch(switches::kAppWindowSize)) { 426 if (command_line_.HasSwitch(switches::kAppWindowSize)) {
435 int width, height; 427 int width, height;
436 width = height = 0; 428 width = height = 0;
437 std::string switch_value = 429 std::string switch_value =
438 command_line_.GetSwitchValueASCII(switches::kAppWindowSize); 430 command_line_.GetSwitchValueASCII(switches::kAppWindowSize);
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 } 983 }
992 984
993 #if !defined(OS_WIN) 985 #if !defined(OS_WIN)
994 // static 986 // static
995 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( 987 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
996 Profile* profile, 988 Profile* profile,
997 const std::vector<GURL>& startup_urls) { 989 const std::vector<GURL>& startup_urls) {
998 return false; 990 return false;
999 } 991 }
1000 #endif 992 #endif
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/sync_extension_helper.cc ('k') | extensions/browser/process_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698