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 "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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
511 return; | 511 return; |
512 } | 512 } |
513 | 513 |
514 const extensions::Extension* extension = | 514 const extensions::Extension* extension = |
515 extensions::ExtensionRegistry::Get(profile_)->GetInstalledExtension( | 515 extensions::ExtensionRegistry::Get(profile_)->GetInstalledExtension( |
516 ArcSupportHost::kHostAppId); | 516 ArcSupportHost::kHostAppId); |
517 CHECK(extension && extensions::util::IsAppLaunchable( | 517 CHECK(extension && extensions::util::IsAppLaunchable( |
518 ArcSupportHost::kHostAppId, profile_)); | 518 ArcSupportHost::kHostAppId, profile_)); |
519 | 519 |
520 OpenApplication(CreateAppLaunchParamsUserContainer( | 520 OpenApplication(CreateAppLaunchParamsUserContainer( |
521 profile_, extension, NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL)); | 521 profile_, extension, WindowOpenDisposition::NEW_WINDOW, |
| 522 extensions::SOURCE_CHROME_INTERNAL)); |
522 } | 523 } |
523 | 524 |
524 void ArcAuthService::OnContextReady() { | 525 void ArcAuthService::OnContextReady() { |
525 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 526 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
526 | 527 |
527 DCHECK(!initial_opt_in_); | 528 DCHECK(!initial_opt_in_); |
528 CheckAndroidManagement(false); | 529 CheckAndroidManagement(false); |
529 } | 530 } |
530 | 531 |
531 void ArcAuthService::OnSyncedPrefChanged(const std::string& path, | 532 void ArcAuthService::OnSyncedPrefChanged(const std::string& path, |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
859 return os << kStateFetchingCode; | 860 return os << kStateFetchingCode; |
860 case ArcAuthService::State::ACTIVE: | 861 case ArcAuthService::State::ACTIVE: |
861 return os << kStateActive; | 862 return os << kStateActive; |
862 default: | 863 default: |
863 NOTREACHED(); | 864 NOTREACHED(); |
864 return os; | 865 return os; |
865 } | 866 } |
866 } | 867 } |
867 | 868 |
868 } // namespace arc | 869 } // namespace arc |
OLD | NEW |