| OLD | NEW |
| 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 "chrome/browser/chromeos/media/media_player.h" | 5 #include "chrome/browser/chromeos/media/media_player.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #include "chrome/browser/ui/browser.h" | 28 #include "chrome/browser/ui/browser.h" |
| 29 #include "chrome/browser/ui/browser_list.h" | 29 #include "chrome/browser/ui/browser_list.h" |
| 30 #include "chrome/browser/ui/browser_window.h" | 30 #include "chrome/browser/ui/browser_window.h" |
| 31 #include "chrome/browser/ui/webui/favicon_source.h" | 31 #include "chrome/browser/ui/webui/favicon_source.h" |
| 32 #include "chrome/common/chrome_notification_types.h" | 32 #include "chrome/common/chrome_notification_types.h" |
| 33 #include "chrome/common/chrome_paths.h" | 33 #include "chrome/common/chrome_paths.h" |
| 34 #include "chrome/common/chrome_switches.h" | 34 #include "chrome/common/chrome_switches.h" |
| 35 #include "chrome/common/jstemplate_builder.h" | 35 #include "chrome/common/jstemplate_builder.h" |
| 36 #include "chrome/common/time_format.h" | 36 #include "chrome/common/time_format.h" |
| 37 #include "chrome/common/url_constants.h" | 37 #include "chrome/common/url_constants.h" |
| 38 #include "content/browser/tab_contents/tab_contents.h" | |
| 39 #include "content/public/browser/browser_thread.h" | 38 #include "content/public/browser/browser_thread.h" |
| 40 #include "content/public/browser/download_manager.h" | 39 #include "content/public/browser/download_manager.h" |
| 41 #include "content/public/browser/user_metrics.h" | 40 #include "content/public/browser/user_metrics.h" |
| 42 #include "grit/browser_resources.h" | 41 #include "grit/browser_resources.h" |
| 43 #include "grit/chromium_strings.h" | 42 #include "grit/chromium_strings.h" |
| 44 #include "grit/generated_resources.h" | 43 #include "grit/generated_resources.h" |
| 45 #include "grit/locale_settings.h" | 44 #include "grit/locale_settings.h" |
| 46 #include "net/base/escape.h" | 45 #include "net/base/escape.h" |
| 47 #include "net/base/load_flags.h" | 46 #include "net/base/load_flags.h" |
| 48 #include "net/url_request/url_request_job.h" | 47 #include "net/url_request/url_request_job.h" |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 | 295 |
| 297 MediaPlayer::MediaPlayer() | 296 MediaPlayer::MediaPlayer() |
| 298 : current_position_(0), | 297 : current_position_(0), |
| 299 pending_playback_request_(false), | 298 pending_playback_request_(false), |
| 300 playlist_browser_(NULL), | 299 playlist_browser_(NULL), |
| 301 mediaplayer_browser_(NULL) { | 300 mediaplayer_browser_(NULL) { |
| 302 for (size_t i = 0; i < arraysize(supported_mime_type_list); ++i) { | 301 for (size_t i = 0; i < arraysize(supported_mime_type_list); ++i) { |
| 303 supported_mime_types_.insert(supported_mime_type_list[i]); | 302 supported_mime_types_.insert(supported_mime_type_list[i]); |
| 304 } | 303 } |
| 305 }; | 304 }; |
| OLD | NEW |