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

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

Issue 2192613002: Moves NewWindowDelegate to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order Created 4 years, 4 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 | « chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc ('k') | no next file » | 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 "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 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/new_window_delegate.h"
10 #include "ash/common/shell_delegate.h" 11 #include "ash/common/shell_delegate.h"
11 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
12 #include "ash/desktop_background/user_wallpaper_delegate.h" 13 #include "ash/desktop_background/user_wallpaper_delegate.h"
13 #include "ash/new_window_delegate.h"
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "components/arc/intent_helper/activity_icon_loader.h" 16 #include "components/arc/intent_helper/activity_icon_loader.h"
17 #include "components/arc/intent_helper/link_handler_model_impl.h" 17 #include "components/arc/intent_helper/link_handler_model_impl.h"
18 #include "components/arc/intent_helper/local_activity_resolver.h" 18 #include "components/arc/intent_helper/local_activity_resolver.h"
19 #include "components/arc/set_wallpaper_delegate.h" 19 #include "components/arc/set_wallpaper_delegate.h"
20 #include "ui/base/layout.h" 20 #include "ui/base/layout.h"
21 #include "url/gurl.h" 21 #include "url/gurl.h"
22 22
23 namespace arc { 23 namespace arc {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 DCHECK(thread_checker_.CalledOnValidThread()); 64 DCHECK(thread_checker_.CalledOnValidThread());
65 icon_loader_->InvalidateIcons(package_name); 65 icon_loader_->InvalidateIcons(package_name);
66 } 66 }
67 67
68 void ArcIntentHelperBridge::OnOpenDownloads() { 68 void ArcIntentHelperBridge::OnOpenDownloads() {
69 DCHECK(thread_checker_.CalledOnValidThread()); 69 DCHECK(thread_checker_.CalledOnValidThread());
70 // TODO(607411): If the FileManager is not yet open this will open to 70 // TODO(607411): If the FileManager is not yet open this will open to
71 // downloads by default, which is what we want. However if it is open it will 71 // downloads by default, which is what we want. However if it is open it will
72 // simply be brought to the forgeground without forcibly being navigated to 72 // simply be brought to the forgeground without forcibly being navigated to
73 // downloads, which is probably not ideal. 73 // downloads, which is probably not ideal.
74 ash::Shell::GetInstance()->new_window_delegate()->OpenFileManager(); 74 ash::WmShell::Get()->new_window_delegate()->OpenFileManager();
75 } 75 }
76 76
77 void ArcIntentHelperBridge::OnOpenUrl(const mojo::String& url) { 77 void ArcIntentHelperBridge::OnOpenUrl(const mojo::String& url) {
78 DCHECK(thread_checker_.CalledOnValidThread()); 78 DCHECK(thread_checker_.CalledOnValidThread());
79 GURL gurl(url.get()); 79 GURL gurl(url.get());
80 ash::WmShell::Get()->delegate()->OpenUrl(gurl); 80 ash::WmShell::Get()->delegate()->OpenUrl(gurl);
81 } 81 }
82 82
83 void ArcIntentHelperBridge::OpenWallpaperPicker() { 83 void ArcIntentHelperBridge::OpenWallpaperPicker() {
84 DCHECK(thread_checker_.CalledOnValidThread()); 84 DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 return handlers_filtered; 119 return handlers_filtered;
120 } 120 }
121 121
122 void ArcIntentHelperBridge::OnIntentFiltersUpdated( 122 void ArcIntentHelperBridge::OnIntentFiltersUpdated(
123 mojo::Array<mojom::IntentFilterPtr> filters) { 123 mojo::Array<mojom::IntentFilterPtr> filters) {
124 DCHECK(thread_checker_.CalledOnValidThread()); 124 DCHECK(thread_checker_.CalledOnValidThread());
125 activity_resolver_->UpdateIntentFilters(std::move(filters)); 125 activity_resolver_->UpdateIntentFilters(std::move(filters));
126 } 126 }
127 127
128 } // namespace arc 128 } // namespace arc
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698