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

Side by Side Diff: chrome/browser/chromeos/profiles/profile_helper.cc

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed John's comments Created 5 years, 7 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/profiles/profile_helper.h" 5 #include "chrome/browser/chromeos/profiles/profile_helper.h"
6 6
7 #include "base/barrier_closure.h" 7 #include "base/barrier_closure.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/browsing_data/browsing_data_helper.h" 11 #include "chrome/browser/browsing_data/browsing_data_helper.h"
12 #include "chrome/browser/chromeos/login/helper.h" 12 #include "chrome/browser/chromeos/login/helper.h"
13 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" 13 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/profiles/profiles_state.h" 16 #include "chrome/browser/profiles/profiles_state.h"
17 #include "chrome/common/chrome_constants.h" 17 #include "chrome/common/chrome_constants.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chromeos/chromeos_switches.h" 19 #include "chromeos/chromeos_switches.h"
20 #include "components/guest_view/browser/guest_view_manager.h"
20 #include "components/user_manager/user.h" 21 #include "components/user_manager/user.h"
21 #include "components/user_manager/user_manager.h" 22 #include "components/user_manager/user_manager.h"
22 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
23 #include "content/public/browser/storage_partition.h" 24 #include "content/public/browser/storage_partition.h"
24 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
25 #include "extensions/browser/guest_view/guest_view_manager.h"
26 #include "extensions/browser/guest_view/web_view/web_view_guest.h" 26 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
27 27
28 namespace chromeos { 28 namespace chromeos {
29 29
30 namespace { 30 namespace {
31 31
32 // As defined in /chromeos/dbus/cryptohome_client.cc. 32 // As defined in /chromeos/dbus/cryptohome_client.cc.
33 static const char kUserIdHashSuffix[] = "-hash"; 33 static const char kUserIdHashSuffix[] = "-hash";
34 34
35 bool ShouldAddProfileDirPrefix(const std::string& user_id_hash) { 35 bool ShouldAddProfileDirPrefix(const std::string& user_id_hash) {
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 user_to_profile_for_testing_[user] = profile; 421 user_to_profile_for_testing_[user] = profile;
422 } 422 }
423 423
424 // static 424 // static
425 std::string ProfileHelper::GetUserIdHashByUserIdForTesting( 425 std::string ProfileHelper::GetUserIdHashByUserIdForTesting(
426 const std::string& user_id) { 426 const std::string& user_id) {
427 return user_id + kUserIdHashSuffix; 427 return user_id + kUserIdHashSuffix;
428 } 428 }
429 429
430 } // namespace chromeos 430 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/helper.cc ('k') | chrome/browser/devtools/devtools_target_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698