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

Side by Side Diff: chrome/browser/chromeos/login/chrome_restart_request.cc

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed unit tests. Created 4 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/chromeos/login/chrome_restart_request.h" 5 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 10 matching lines...) Expand all
21 #include "base/values.h" 21 #include "base/values.h"
22 #include "cc/base/switches.h" 22 #include "cc/base/switches.h"
23 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/chromeos/boot_times_recorder.h" 24 #include "chrome/browser/chromeos/boot_times_recorder.h"
25 #include "chrome/browser/lifetime/application_lifetime.h" 25 #include "chrome/browser/lifetime/application_lifetime.h"
26 #include "chrome/common/chrome_constants.h" 26 #include "chrome/common/chrome_constants.h"
27 #include "chrome/common/chrome_paths.h" 27 #include "chrome/common/chrome_paths.h"
28 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
30 #include "chromeos/chromeos_switches.h" 30 #include "chromeos/chromeos_switches.h"
31 #include "chromeos/cryptohome/cryptohome_parameters.h"
31 #include "chromeos/dbus/dbus_thread_manager.h" 32 #include "chromeos/dbus/dbus_thread_manager.h"
32 #include "chromeos/dbus/session_manager_client.h" 33 #include "chromeos/dbus/session_manager_client.h"
33 #include "chromeos/login/user_names.h" 34 #include "chromeos/login/user_names.h"
34 #include "components/policy/core/common/policy_switches.h" 35 #include "components/policy/core/common/policy_switches.h"
35 #include "components/prefs/json_pref_store.h" 36 #include "components/prefs/json_pref_store.h"
36 #include "components/prefs/pref_service.h" 37 #include "components/prefs/pref_service.h"
37 #include "components/signin/core/account_id/account_id.h" 38 #include "components/signin/core/account_id/account_id.h"
38 #include "components/tracing/tracing_switches.h" 39 #include "components/tracing/tracing_switches.h"
39 #include "content/public/browser/browser_thread.h" 40 #include "content/public/browser/browser_thread.h"
40 #include "content/public/common/content_switches.h" 41 #include "content/public/common/content_switches.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 } // namespace 317 } // namespace
317 318
318 void GetOffTheRecordCommandLine(const GURL& start_url, 319 void GetOffTheRecordCommandLine(const GURL& start_url,
319 bool is_oobe_completed, 320 bool is_oobe_completed,
320 const base::CommandLine& base_command_line, 321 const base::CommandLine& base_command_line,
321 base::CommandLine* command_line) { 322 base::CommandLine* command_line) {
322 base::DictionaryValue otr_switches; 323 base::DictionaryValue otr_switches;
323 otr_switches.SetString(switches::kGuestSession, std::string()); 324 otr_switches.SetString(switches::kGuestSession, std::string());
324 otr_switches.SetString(::switches::kIncognito, std::string()); 325 otr_switches.SetString(::switches::kIncognito, std::string());
325 otr_switches.SetString(::switches::kLoggingLevel, kGuestModeLoggingLevel); 326 otr_switches.SetString(::switches::kLoggingLevel, kGuestModeLoggingLevel);
326 otr_switches.SetString(switches::kLoginUser, 327 otr_switches.SetString(
327 login::GuestAccountId().GetUserEmail()); 328 switches::kLoginUser,
329 cryptohome::Identification(login::GuestAccountId()).id());
328 330
329 // Override the home page. 331 // Override the home page.
330 otr_switches.SetString(::switches::kHomePage, 332 otr_switches.SetString(::switches::kHomePage,
331 GURL(chrome::kChromeUINewTabURL).spec()); 333 GURL(chrome::kChromeUINewTabURL).spec());
332 334
333 // If OOBE is not finished yet, lock down the guest session to not allow 335 // If OOBE is not finished yet, lock down the guest session to not allow
334 // surfing the web. Guest mode is still useful to inspect logs and run network 336 // surfing the web. Guest mode is still useful to inspect logs and run network
335 // diagnostics. 337 // diagnostics.
336 if (!is_oobe_completed) 338 if (!is_oobe_completed)
337 otr_switches.SetString(switches::kOobeGuestSession, std::string()); 339 otr_switches.SetString(switches::kOobeGuestSession, std::string());
(...skipping 15 matching lines...) Expand all
353 // Relaunch chrome without session manager on dev box. 355 // Relaunch chrome without session manager on dev box.
354 ReLaunch(command_line); 356 ReLaunch(command_line);
355 return; 357 return;
356 } 358 }
357 359
358 // ChromeRestartRequest deletes itself after request sent to session manager. 360 // ChromeRestartRequest deletes itself after request sent to session manager.
359 (new ChromeRestartRequest(command_line.argv()))->Start(); 361 (new ChromeRestartRequest(command_line.argv()))->Start();
360 } 362 }
361 363
362 } // namespace chromeos 364 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698