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

Side by Side Diff: components/arc/intent_helper/arc_intent_helper_bridge.cc

Issue 2766543002: Move even more from WmShell to Shell (Closed)
Patch Set: 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
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 "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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 DCHECK(thread_checker_.CalledOnValidThread()); 62 DCHECK(thread_checker_.CalledOnValidThread());
63 icon_loader_.InvalidateIcons(package_name); 63 icon_loader_.InvalidateIcons(package_name);
64 } 64 }
65 65
66 void ArcIntentHelperBridge::OnOpenDownloads() { 66 void ArcIntentHelperBridge::OnOpenDownloads() {
67 DCHECK(thread_checker_.CalledOnValidThread()); 67 DCHECK(thread_checker_.CalledOnValidThread());
68 // TODO(607411): If the FileManager is not yet open this will open to 68 // TODO(607411): If the FileManager is not yet open this will open to
69 // downloads by default, which is what we want. However if it is open it will 69 // downloads by default, which is what we want. However if it is open it will
70 // simply be brought to the forgeground without forcibly being navigated to 70 // simply be brought to the forgeground without forcibly being navigated to
71 // downloads, which is probably not ideal. 71 // downloads, which is probably not ideal.
72 ash::WmShell::Get()->new_window_controller()->OpenFileManager(); 72 ash::Shell::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::Shell::Get()->shell_delegate()->OpenUrlFromArc(GURL(url)); 77 ash::Shell::Get()->shell_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::Shell::GetInstance()->wallpaper_controller()->OpenSetWallpaperPage(); 82 ash::Shell::GetInstance()->wallpaper_controller()->OpenSetWallpaperPage();
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc ('k') | components/exo/wm_helper_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698