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

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

Issue 11968034: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: git://nomatter.syd/chromium/src.git@master
Patch Set: private Created 7 years, 10 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 (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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 chrome_browser_net::EnablePredictorDetailedLog(true); 329 chrome_browser_net::EnablePredictorDetailedLog(true);
330 if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) && 330 if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) &&
331 profile->GetNetworkPredictor()) { 331 profile->GetNetworkPredictor()) {
332 profile->GetNetworkPredictor()->EnablePredictor(false); 332 profile->GetNetworkPredictor()->EnablePredictor(false);
333 } 333 }
334 334
335 if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit)) 335 if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit))
336 base::StatisticsRecorder::set_dump_on_exit(true); 336 base::StatisticsRecorder::set_dump_on_exit(true);
337 337
338 #if defined(ENABLE_APP_LIST) 338 #if defined(ENABLE_APP_LIST)
339 chrome::InitAppList(); 339 chrome::InitAppList(profile);
340 if (command_line_.HasSwitch(switches::kShowAppList)) { 340 if (command_line_.HasSwitch(switches::kShowAppList)) {
341 chrome::ShowAppList(); 341 chrome::ShowAppList(profile);
342 return true; 342 return true;
343 } 343 }
344 #endif 344 #endif
345 345
346 // Open the required browser windows and tabs. First, see if 346 // Open the required browser windows and tabs. First, see if
347 // we're being run as an application window. If so, the user 347 // we're being run as an application window. If so, the user
348 // opened an app shortcut. Don't restore tabs or open initial 348 // opened an app shortcut. Don't restore tabs or open initial
349 // URLs in that case. The user should see the window as an app, 349 // URLs in that case. The user should see the window as an app,
350 // not as chrome. 350 // not as chrome.
351 // Special case is when app switches are passed but we do want to restore 351 // Special case is when app switches are passed but we do want to restore
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
962 } 962 }
963 963
964 #if !defined(OS_WIN) || defined(USE_AURA) 964 #if !defined(OS_WIN) || defined(USE_AURA)
965 // static 965 // static
966 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( 966 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
967 Profile* profile, 967 Profile* profile,
968 const std::vector<GURL>& startup_urls) { 968 const std::vector<GURL>& startup_urls) {
969 return false; 969 return false;
970 } 970 }
971 #endif 971 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator.cc ('k') | chrome/browser/ui/views/app_list/app_list_controller_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698