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

Side by Side Diff: ash/test/test_shell_delegate.cc

Issue 1843563003: Move arc_intent_helper_bridge.h from c/b/chromeos/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address a comment Created 4 years, 8 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 | « ash/test/test_shell_delegate.h ('k') | chrome/browser/chromeos/arc/arc_intent_helper_bridge.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/test/test_shell_delegate.h" 5 #include "ash/test/test_shell_delegate.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "ash/default_accessibility_delegate.h" 9 #include "ash/default_accessibility_delegate.h"
10 #include "ash/gpu_support_stub.h" 10 #include "ash/gpu_support_stub.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 void TestShellDelegate::AddVirtualKeyboardStateObserver( 133 void TestShellDelegate::AddVirtualKeyboardStateObserver(
134 VirtualKeyboardStateObserver* observer) { 134 VirtualKeyboardStateObserver* observer) {
135 keyboard_state_observer_list_.AddObserver(observer); 135 keyboard_state_observer_list_.AddObserver(observer);
136 } 136 }
137 137
138 void TestShellDelegate::RemoveVirtualKeyboardStateObserver( 138 void TestShellDelegate::RemoveVirtualKeyboardStateObserver(
139 VirtualKeyboardStateObserver* observer) { 139 VirtualKeyboardStateObserver* observer) {
140 keyboard_state_observer_list_.RemoveObserver(observer); 140 keyboard_state_observer_list_.RemoveObserver(observer);
141 } 141 }
142 142
143 void TestShellDelegate::OpenUrl(const GURL& url) {}
144
143 app_list::AppListViewDelegate* TestShellDelegate::GetAppListViewDelegate() { 145 app_list::AppListViewDelegate* TestShellDelegate::GetAppListViewDelegate() {
144 if (!app_list_view_delegate_) 146 if (!app_list_view_delegate_)
145 app_list_view_delegate_.reset(new app_list::test::AppListTestViewDelegate); 147 app_list_view_delegate_.reset(new app_list::test::AppListTestViewDelegate);
146 return app_list_view_delegate_.get(); 148 return app_list_view_delegate_.get();
147 } 149 }
148 150
149 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) { 151 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) {
150 return new TestShelfDelegate(model); 152 return new TestShelfDelegate(model);
151 } 153 }
152 154
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 #if defined(OS_CHROMEOS) 199 #if defined(OS_CHROMEOS)
198 Shell* shell = Shell::GetInstance(); 200 Shell* shell = Shell::GetInstance();
199 static_cast<MediaDelegateImpl*>(shell->media_delegate()) 201 static_cast<MediaDelegateImpl*>(shell->media_delegate())
200 ->set_media_capture_state(state); 202 ->set_media_capture_state(state);
201 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); 203 shell->system_tray_notifier()->NotifyMediaCaptureChanged();
202 #endif 204 #endif
203 } 205 }
204 206
205 } // namespace test 207 } // namespace test
206 } // namespace ash 208 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/chromeos/arc/arc_intent_helper_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698