OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_auth_service.h" | 5 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 DCHECK(app_window_registry); | 244 DCHECK(app_window_registry); |
245 if (app_window_registry->GetCurrentAppWindowForApp(kArcSupportExtensionId)) | 245 if (app_window_registry->GetCurrentAppWindowForApp(kArcSupportExtensionId)) |
246 return; | 246 return; |
247 | 247 |
248 const extensions::Extension* extension = | 248 const extensions::Extension* extension = |
249 extensions::ExtensionRegistry::Get(profile_)->GetInstalledExtension( | 249 extensions::ExtensionRegistry::Get(profile_)->GetInstalledExtension( |
250 kArcSupportExtensionId); | 250 kArcSupportExtensionId); |
251 CHECK(extension && | 251 CHECK(extension && |
252 extensions::util::IsAppLaunchable(kArcSupportExtensionId, profile_)); | 252 extensions::util::IsAppLaunchable(kArcSupportExtensionId, profile_)); |
253 | 253 |
254 AppLaunchParams params(profile_, extension, NEW_WINDOW, | 254 OpenApplication(CreateAppLaunchParamsUserContainer( |
255 extensions::SOURCE_CHROME_INTERNAL); | 255 profile_, extension, NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL)); |
256 OpenApplication(params); | |
257 } | 256 } |
258 | 257 |
259 void ArcAuthService::OnMergeSessionSuccess(const std::string& data) { | 258 void ArcAuthService::OnMergeSessionSuccess(const std::string& data) { |
260 DCHECK(thread_checker_.CalledOnValidThread()); | 259 DCHECK(thread_checker_.CalledOnValidThread()); |
261 | 260 |
262 DCHECK(!initial_opt_in_); | 261 DCHECK(!initial_opt_in_); |
263 context_prepared_ = true; | 262 context_prepared_ = true; |
264 ShowUI(UIPage::LSO_PROGRESS, base::string16()); | 263 ShowUI(UIPage::LSO_PROGRESS, base::string16()); |
265 } | 264 } |
266 | 265 |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
473 return os << kStateFetchingCode; | 472 return os << kStateFetchingCode; |
474 case ArcAuthService::State::ACTIVE: | 473 case ArcAuthService::State::ACTIVE: |
475 return os << kStateActive; | 474 return os << kStateActive; |
476 default: | 475 default: |
477 NOTREACHED(); | 476 NOTREACHED(); |
478 return os; | 477 return os; |
479 } | 478 } |
480 } | 479 } |
481 | 480 |
482 } // namespace arc | 481 } // namespace arc |
OLD | NEW |