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

Side by Side Diff: chrome/browser/chromeos/arc/arc_session_manager.cc

Issue 2751913004: arc: Fix race conditon when Play Store is started too early. (Closed)
Patch Set: nits Created 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/arc/arc_app_launcher.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/arc/arc_session_manager.h" 5 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/shelf/shelf_delegate.h" 9 #include "ash/common/shelf/shelf_delegate.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // kiosk app and device is not needed for opt-in; 251 // kiosk app and device is not needed for opt-in;
252 // * When ARC is managed and all OptIn preferences are managed too, because 252 // * When ARC is managed and all OptIn preferences are managed too, because
253 // the whole OptIn flow should happen as seamless as possible for the 253 // the whole OptIn flow should happen as seamless as possible for the
254 // user. 254 // user.
255 const bool suppress_play_store_app = 255 const bool suppress_play_store_app =
256 IsArcOptInVerificationDisabled() || IsArcKioskMode() || 256 IsArcOptInVerificationDisabled() || IsArcKioskMode() ||
257 (IsArcPlayStoreEnabledPreferenceManagedForProfile(profile_) && 257 (IsArcPlayStoreEnabledPreferenceManagedForProfile(profile_) &&
258 AreArcAllOptInPreferencesManagedForProfile(profile_)); 258 AreArcAllOptInPreferencesManagedForProfile(profile_));
259 if (!suppress_play_store_app) { 259 if (!suppress_play_store_app) {
260 playstore_launcher_.reset( 260 playstore_launcher_.reset(
261 new ArcAppLauncher(profile_, kPlayStoreAppId, true)); 261 new ArcAppLauncher(profile_, kPlayStoreAppId, true, false));
262 } 262 }
263 263
264 for (auto& observer : observer_list_) 264 for (auto& observer : observer_list_)
265 observer.OnArcInitialStart(); 265 observer.OnArcInitialStart();
266 return; 266 return;
267 } 267 }
268 268
269 ArcSupportHost::Error error; 269 ArcSupportHost::Error error;
270 VLOG(1) << "ARC provisioning failed: " << result << "."; 270 VLOG(1) << "ARC provisioning failed: " << result << ".";
271 switch (result) { 271 switch (result) {
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 974
975 #undef MAP_STATE 975 #undef MAP_STATE
976 976
977 // Some compilers report an error even if all values of an enum-class are 977 // Some compilers report an error even if all values of an enum-class are
978 // covered exhaustively in a switch statement. 978 // covered exhaustively in a switch statement.
979 NOTREACHED() << "Invalid value " << static_cast<int>(state); 979 NOTREACHED() << "Invalid value " << static_cast<int>(state);
980 return os; 980 return os;
981 } 981 }
982 982
983 } // namespace arc 983 } // namespace arc
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/arc/arc_app_launcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698