OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/dom_ui/filebrowse_ui.h" | 5 #include "chrome/browser/dom_ui/filebrowse_ui.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
615 #endif | 615 #endif |
616 } | 616 } |
617 | 617 |
618 void FilebrowseHandler::PlayMediaFile(const ListValue* args) { | 618 void FilebrowseHandler::PlayMediaFile(const ListValue* args) { |
619 #if defined(OS_CHROMEOS) | 619 #if defined(OS_CHROMEOS) |
620 std::string url = WideToUTF8(ExtractStringValue(args)); | 620 std::string url = WideToUTF8(ExtractStringValue(args)); |
621 GURL gurl(url); | 621 GURL gurl(url); |
622 | 622 |
623 Browser* browser = Browser::GetBrowserForController( | 623 Browser* browser = Browser::GetBrowserForController( |
624 &tab_contents_->controller(), NULL); | 624 &tab_contents_->controller(), NULL); |
625 MediaPlayer* mediaplayer = MediaPlayer::Get(); | 625 MediaPlayer* mediaplayer = MediaPlayer::GetInstance(); |
626 mediaplayer->ForcePlayMediaURL(gurl, browser); | 626 mediaplayer->ForcePlayMediaURL(gurl, browser); |
627 #endif | 627 #endif |
628 } | 628 } |
629 | 629 |
630 void FilebrowseHandler::EnqueueMediaFile(const ListValue* args) { | 630 void FilebrowseHandler::EnqueueMediaFile(const ListValue* args) { |
631 #if defined(OS_CHROMEOS) | 631 #if defined(OS_CHROMEOS) |
632 std::string url = WideToUTF8(ExtractStringValue(args)); | 632 std::string url = WideToUTF8(ExtractStringValue(args)); |
633 GURL gurl(url); | 633 GURL gurl(url); |
634 | 634 |
635 Browser* browser = Browser::GetBrowserForController( | 635 Browser* browser = Browser::GetBrowserForController( |
636 &tab_contents_->controller(), NULL); | 636 &tab_contents_->controller(), NULL); |
637 MediaPlayer* mediaplayer = MediaPlayer::Get(); | 637 MediaPlayer* mediaplayer = MediaPlayer::GetInstance(); |
638 mediaplayer->EnqueueMediaURL(gurl, browser); | 638 mediaplayer->EnqueueMediaURL(gurl, browser); |
639 #endif | 639 #endif |
640 } | 640 } |
641 | 641 |
642 void FilebrowseHandler::HandleIsAdvancedEnabled(const ListValue* args) { | 642 void FilebrowseHandler::HandleIsAdvancedEnabled(const ListValue* args) { |
643 #if defined(OS_CHROMEOS) | 643 #if defined(OS_CHROMEOS) |
644 bool is_enabled = CommandLine::ForCurrentProcess()->HasSwitch( | 644 bool is_enabled = CommandLine::ForCurrentProcess()->HasSwitch( |
645 switches::kEnableAdvancedFileSystem); | 645 switches::kEnableAdvancedFileSystem); |
646 bool mp_enabled = CommandLine::ForCurrentProcess()->HasSwitch( | 646 bool mp_enabled = CommandLine::ForCurrentProcess()->HasSwitch( |
647 switches::kEnableMediaPlayer); | 647 switches::kEnableMediaPlayer); |
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1204 } | 1204 } |
1205 } | 1205 } |
1206 | 1206 |
1207 return NULL; | 1207 return NULL; |
1208 } | 1208 } |
1209 | 1209 |
1210 const int FileBrowseUI::kPopupWidth = 250; | 1210 const int FileBrowseUI::kPopupWidth = 250; |
1211 const int FileBrowseUI::kPopupHeight = 300; | 1211 const int FileBrowseUI::kPopupHeight = 300; |
1212 const int FileBrowseUI::kSmallPopupWidth = 250; | 1212 const int FileBrowseUI::kSmallPopupWidth = 250; |
1213 const int FileBrowseUI::kSmallPopupHeight = 50; | 1213 const int FileBrowseUI::kSmallPopupHeight = 50; |
OLD | NEW |