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

Side by Side Diff: chrome/browser/chromeos/media/media_player_browsertest.cc

Issue 10094012: Made File Manager respect the user-selected launch type (tab/pinned tab/window/fullscreen) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved changes requiring external OWNERs approval to another patch Created 8 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 | Annotate | Revision Log
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/chromeos/media/media_player.h" 8 #include "chrome/browser/chromeos/media/media_player.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_list.h" 10 #include "chrome/browser/ui/browser_list.h"
(...skipping 30 matching lines...) Expand all
41 IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, Popup) { 41 IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, Popup) {
42 ASSERT_TRUE(test_server()->Start()); 42 ASSERT_TRUE(test_server()->Start());
43 // Doing this so we have a valid profile. 43 // Doing this so we have a valid profile.
44 ui_test_utils::NavigateToURL(browser(), 44 ui_test_utils::NavigateToURL(browser(),
45 GURL("chrome://downloads")); 45 GURL("chrome://downloads"));
46 46
47 MediaPlayer* player = MediaPlayer::GetInstance(); 47 MediaPlayer* player = MediaPlayer::GetInstance();
48 // Check that its not currently visible 48 // Check that its not currently visible
49 ASSERT_FALSE(IsPlayerVisible()); 49 ASSERT_FALSE(IsPlayerVisible());
50 50
51 player->PopupMediaPlayer(NULL); 51 player->PopupMediaPlayer();
52 player->ForcePlayMediaURL(GetMusicTestURL()); 52 player->ForcePlayMediaURL(GetMusicTestURL());
53 53
54 ASSERT_TRUE(IsPlayerVisible()); 54 ASSERT_TRUE(IsPlayerVisible());
55 } 55 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/media/media_player.cc ('k') | chrome/browser/chromeos/media/media_player_extension_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698