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

Side by Side Diff: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (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 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 <vector> 5 #include <vector>
6 6
7 #include "ash/common/wm_shell.h"
7 #include "ash/shell.h" 8 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray.h" 9 #include "ash/system/tray/system_tray.h"
9 #include "ash/system/tray/system_tray_delegate.h" 10 #include "ash/system/tray/system_tray_delegate.h"
10 #include "ash/test/tray_cast_test_api.h" 11 #include "ash/test/tray_cast_test_api.h"
11 #include "ash/wm_shell.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "chrome/browser/media/router/media_routes_observer.h" 13 #include "chrome/browser/media/router/media_routes_observer.h"
14 #include "chrome/browser/media/router/media_sinks_observer.h" 14 #include "chrome/browser/media/router/media_sinks_observer.h"
15 #include "chrome/browser/media/router/media_source_helper.h" 15 #include "chrome/browser/media/router/media_source_helper.h"
16 #include "chrome/browser/media/router/mock_media_router.h" 16 #include "chrome/browser/media/router/mock_media_router.h"
17 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" 17 #include "chrome/browser/ui/ash/cast_config_client_media_router.h"
18 #include "chrome/test/base/in_process_browser_test.h" 18 #include "chrome/test/base/in_process_browser_test.h"
19 #include "content/public/test/test_utils.h" 19 #include "content/public/test/test_utils.h"
20 #include "url/gurl.h" 20 #include "url/gurl.h"
21 21
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 EXPECT_TRUE(test_api.IsTrayCastViewVisible()); 185 EXPECT_TRUE(test_api.IsTrayCastViewVisible());
186 EXPECT_EQ("local_route", test_api.GetDisplayedCastId()); 186 EXPECT_EQ("local_route", test_api.GetDisplayedCastId());
187 187
188 // When a casting session stops, we shouldn't display the cast view. 188 // When a casting session stops, we shouldn't display the cast view.
189 test_api.OnCastingSessionStartedOrStopped(false /*is_casting*/); 189 test_api.OnCastingSessionStartedOrStopped(false /*is_casting*/);
190 media_routes_observer()->OnRoutesUpdated( 190 media_routes_observer()->OnRoutesUpdated(
191 no_routes, std::vector<media_router::MediaRoute::Id>()); 191 no_routes, std::vector<media_router::MediaRoute::Id>());
192 content::RunAllPendingInMessageLoop(); 192 content::RunAllPendingInMessageLoop();
193 EXPECT_FALSE(test_api.IsTrayCastViewVisible()); 193 EXPECT_FALSE(test_api.IsTrayCastViewVisible());
194 } 194 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/volume_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698