| OLD | NEW |
| 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 "components/arc/intent_helper/arc_intent_helper_bridge.h" | 5 #include "components/arc/intent_helper/arc_intent_helper_bridge.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/new_window_controller.h" | 9 #include "ash/common/new_window_controller.h" |
| 10 #include "ash/common/shell_delegate.h" | 10 #include "ash/common/shell_delegate.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 ash::WmShell::Get()->new_window_controller()->OpenFileManager(); | 72 ash::WmShell::Get()->new_window_controller()->OpenFileManager(); |
| 73 } | 73 } |
| 74 | 74 |
| 75 void ArcIntentHelperBridge::OnOpenUrl(const std::string& url) { | 75 void ArcIntentHelperBridge::OnOpenUrl(const std::string& url) { |
| 76 DCHECK(thread_checker_.CalledOnValidThread()); | 76 DCHECK(thread_checker_.CalledOnValidThread()); |
| 77 ash::WmShell::Get()->delegate()->OpenUrlFromArc(GURL(url)); | 77 ash::WmShell::Get()->delegate()->OpenUrlFromArc(GURL(url)); |
| 78 } | 78 } |
| 79 | 79 |
| 80 void ArcIntentHelperBridge::OpenWallpaperPicker() { | 80 void ArcIntentHelperBridge::OpenWallpaperPicker() { |
| 81 DCHECK(thread_checker_.CalledOnValidThread()); | 81 DCHECK(thread_checker_.CalledOnValidThread()); |
| 82 ash::WmShell::Get()->wallpaper_controller()->OpenSetWallpaperPage(); | 82 ash::Shell::GetInstance()->wallpaper_controller()->OpenSetWallpaperPage(); |
| 83 } | 83 } |
| 84 | 84 |
| 85 void ArcIntentHelperBridge::SetWallpaperDeprecated( | 85 void ArcIntentHelperBridge::SetWallpaperDeprecated( |
| 86 const std::vector<uint8_t>& jpeg_data) { | 86 const std::vector<uint8_t>& jpeg_data) { |
| 87 DCHECK(thread_checker_.CalledOnValidThread()); | 87 DCHECK(thread_checker_.CalledOnValidThread()); |
| 88 LOG(ERROR) << "IntentHelper.SetWallpaper is deprecated"; | 88 LOG(ERROR) << "IntentHelper.SetWallpaper is deprecated"; |
| 89 } | 89 } |
| 90 | 90 |
| 91 ArcIntentHelperBridge::GetResult ArcIntentHelperBridge::GetActivityIcons( | 91 ArcIntentHelperBridge::GetResult ArcIntentHelperBridge::GetActivityIcons( |
| 92 const std::vector<ActivityName>& activities, | 92 const std::vector<ActivityName>& activities, |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 void ArcIntentHelperBridge::OnIntentFiltersUpdated( | 134 void ArcIntentHelperBridge::OnIntentFiltersUpdated( |
| 135 std::vector<IntentFilter> filters) { | 135 std::vector<IntentFilter> filters) { |
| 136 DCHECK(thread_checker_.CalledOnValidThread()); | 136 DCHECK(thread_checker_.CalledOnValidThread()); |
| 137 activity_resolver_->UpdateIntentFilters(std::move(filters)); | 137 activity_resolver_->UpdateIntentFilters(std::move(filters)); |
| 138 | 138 |
| 139 for (auto& observer : observer_list_) | 139 for (auto& observer : observer_list_) |
| 140 observer.OnIntentFiltersUpdated(); | 140 observer.OnIntentFiltersUpdated(); |
| 141 } | 141 } |
| 142 | 142 |
| 143 } // namespace arc | 143 } // namespace arc |
| OLD | NEW |