| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/singleton.h" | 9 #include "base/memory/singleton.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/browser/history/history_types.h" | 23 #include "chrome/browser/history/history_types.h" |
| 24 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
| 25 #include "chrome/browser/tabs/tab_strip_model.h" | 25 #include "chrome/browser/tabs/tab_strip_model.h" |
| 26 #include "chrome/browser/ui/browser.h" | 26 #include "chrome/browser/ui/browser.h" |
| 27 #include "chrome/browser/ui/browser_list.h" | 27 #include "chrome/browser/ui/browser_list.h" |
| 28 #include "chrome/browser/ui/browser_window.h" | 28 #include "chrome/browser/ui/browser_window.h" |
| 29 #include "chrome/browser/ui/webui/favicon_source.h" | 29 #include "chrome/browser/ui/webui/favicon_source.h" |
| 30 #include "chrome/common/chrome_paths.h" | 30 #include "chrome/common/chrome_paths.h" |
| 31 #include "chrome/common/chrome_switches.h" | 31 #include "chrome/common/chrome_switches.h" |
| 32 #include "chrome/common/jstemplate_builder.h" | 32 #include "chrome/common/jstemplate_builder.h" |
| 33 #include "chrome/common/net/url_fetcher.h" | |
| 34 #include "chrome/common/time_format.h" | 33 #include "chrome/common/time_format.h" |
| 35 #include "chrome/common/url_constants.h" | 34 #include "chrome/common/url_constants.h" |
| 36 #include "content/browser/browser_thread.h" | 35 #include "content/browser/browser_thread.h" |
| 37 #include "content/browser/tab_contents/tab_contents.h" | 36 #include "content/browser/tab_contents/tab_contents.h" |
| 38 #include "content/browser/user_metrics.h" | 37 #include "content/browser/user_metrics.h" |
| 38 #include "content/common/url_fetcher.h" |
| 39 #include "grit/browser_resources.h" | 39 #include "grit/browser_resources.h" |
| 40 #include "grit/chromium_strings.h" | 40 #include "grit/chromium_strings.h" |
| 41 #include "grit/generated_resources.h" | 41 #include "grit/generated_resources.h" |
| 42 #include "grit/locale_settings.h" | 42 #include "grit/locale_settings.h" |
| 43 #include "net/base/escape.h" | 43 #include "net/base/escape.h" |
| 44 #include "net/base/load_flags.h" | 44 #include "net/base/load_flags.h" |
| 45 #include "net/url_request/url_request_job.h" | 45 #include "net/url_request/url_request_job.h" |
| 46 #include "ui/base/resource/resource_bundle.h" | 46 #include "ui/base/resource/resource_bundle.h" |
| 47 | 47 |
| 48 #if defined(OS_CHROMEOS) | 48 #if defined(OS_CHROMEOS) |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 | 302 |
| 303 MediaPlayer::MediaPlayer() | 303 MediaPlayer::MediaPlayer() |
| 304 : current_position_(0), | 304 : current_position_(0), |
| 305 pending_playback_request_(false), | 305 pending_playback_request_(false), |
| 306 playlist_browser_(NULL), | 306 playlist_browser_(NULL), |
| 307 mediaplayer_browser_(NULL) { | 307 mediaplayer_browser_(NULL) { |
| 308 for (size_t i = 0; i < arraysize(supported_mime_type_list); ++i) { | 308 for (size_t i = 0; i < arraysize(supported_mime_type_list); ++i) { |
| 309 supported_mime_types_.insert(supported_mime_type_list[i]); | 309 supported_mime_types_.insert(supported_mime_type_list[i]); |
| 310 } | 310 } |
| 311 }; | 311 }; |
| OLD | NEW |