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

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

Issue 12090062: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable tests on aura 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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 chrome_browser_net::EnablePredictorDetailedLog(true); 328 chrome_browser_net::EnablePredictorDetailedLog(true);
329 if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) && 329 if (command_line_.HasSwitch(switches::kDnsPrefetchDisable) &&
330 profile->GetNetworkPredictor()) { 330 profile->GetNetworkPredictor()) {
331 profile->GetNetworkPredictor()->EnablePredictor(false); 331 profile->GetNetworkPredictor()->EnablePredictor(false);
332 } 332 }
333 333
334 if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit)) 334 if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit))
335 base::StatisticsRecorder::set_dump_on_exit(true); 335 base::StatisticsRecorder::set_dump_on_exit(true);
336 336
337 #if defined(ENABLE_APP_LIST) 337 #if defined(ENABLE_APP_LIST)
338 chrome::InitAppList(); 338 chrome::InitAppList(profile);
339 if (command_line_.HasSwitch(switches::kShowAppList)) { 339 if (command_line_.HasSwitch(switches::kShowAppList)) {
340 chrome::ShowAppList(); 340 chrome::ShowAppList(profile);
341 return true; 341 return true;
342 } 342 }
343 #endif 343 #endif
344 344
345 // Open the required browser windows and tabs. First, see if 345 // Open the required browser windows and tabs. First, see if
346 // we're being run as an application window. If so, the user 346 // we're being run as an application window. If so, the user
347 // opened an app shortcut. Don't restore tabs or open initial 347 // opened an app shortcut. Don't restore tabs or open initial
348 // URLs in that case. The user should see the window as an app, 348 // URLs in that case. The user should see the window as an app,
349 // not as chrome. 349 // not as chrome.
350 // Special case is when app switches are passed but we do want to restore 350 // Special case is when app switches are passed but we do want to restore
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 } 941 }
942 942
943 #if !defined(OS_WIN) || defined(USE_AURA) 943 #if !defined(OS_WIN) || defined(USE_AURA)
944 // static 944 // static
945 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( 945 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
946 Profile* profile, 946 Profile* profile,
947 const std::vector<GURL>& startup_urls) { 947 const std::vector<GURL>& startup_urls) {
948 return false; 948 return false;
949 } 949 }
950 #endif 950 #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