OLD | NEW |
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/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 virtual void OnLoginSuccess(const UserContext& user_context, | 184 virtual void OnLoginSuccess(const UserContext& user_context, |
185 bool pending_requests, | 185 bool pending_requests, |
186 bool using_oauth) OVERRIDE { | 186 bool using_oauth) OVERRIDE { |
187 pending_requests_ = pending_requests; | 187 pending_requests_ = pending_requests; |
188 if (!profile_prepared_) { | 188 if (!profile_prepared_) { |
189 // Will call OnProfilePrepared in the end. | 189 // Will call OnProfilePrepared in the end. |
190 LoginUtils::Get()->PrepareProfile(user_context, | 190 LoginUtils::Get()->PrepareProfile(user_context, |
191 std::string(), // display_email | 191 std::string(), // display_email |
192 using_oauth, | 192 using_oauth, |
193 false, // has_cookies | 193 false, // has_cookies |
| 194 true, // has_active_session |
194 this); | 195 this); |
195 } else if (!pending_requests) { | 196 } else if (!pending_requests) { |
196 delete this; | 197 delete this; |
197 } | 198 } |
198 } | 199 } |
199 | 200 |
200 // LoginUtils::Delegate implementation: | 201 // LoginUtils::Delegate implementation: |
201 virtual void OnProfilePrepared(Profile* profile) OVERRIDE { | 202 virtual void OnProfilePrepared(Profile* profile) OVERRIDE { |
202 profile_prepared_ = true; | 203 profile_prepared_ = true; |
203 LoginUtils::Get()->DoBrowserLaunch(profile, NULL); | 204 LoginUtils::Get()->DoBrowserLaunch(profile, NULL); |
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
927 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); | 928 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); |
928 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); | 929 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); |
929 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); | 930 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); |
930 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); | 931 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); |
931 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); | 932 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); |
932 // This is necessary to start the experiment as a side effect. | 933 // This is necessary to start the experiment as a side effect. |
933 trial->group(); | 934 trial->group(); |
934 } | 935 } |
935 | 936 |
936 } // namespace chromeos | 937 } // namespace chromeos |
OLD | NEW |