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/mediaplayer_ui.h" | 5 #include "chrome/browser/dom_ui/mediaplayer_ui.h" |
6 | 6 |
7 #include "app/resource_bundle.h" | |
8 #include "base/command_line.h" | 7 #include "base/command_line.h" |
9 #include "base/logging.h" | 8 #include "base/logging.h" |
10 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
11 #include "base/path_service.h" | 10 #include "base/path_service.h" |
12 #include "base/singleton.h" | 11 #include "base/singleton.h" |
13 #include "base/string_piece.h" | 12 #include "base/string_piece.h" |
14 #include "base/string_util.h" | 13 #include "base/string_util.h" |
15 #include "base/threading/thread.h" | 14 #include "base/threading/thread.h" |
16 #include "base/time.h" | 15 #include "base/time.h" |
17 #include "base/values.h" | 16 #include "base/values.h" |
(...skipping 17 matching lines...) Expand all Loading... |
35 #include "chrome/common/net/url_fetcher.h" | 34 #include "chrome/common/net/url_fetcher.h" |
36 #include "chrome/common/time_format.h" | 35 #include "chrome/common/time_format.h" |
37 #include "chrome/common/url_constants.h" | 36 #include "chrome/common/url_constants.h" |
38 #include "grit/browser_resources.h" | 37 #include "grit/browser_resources.h" |
39 #include "grit/chromium_strings.h" | 38 #include "grit/chromium_strings.h" |
40 #include "grit/generated_resources.h" | 39 #include "grit/generated_resources.h" |
41 #include "grit/locale_settings.h" | 40 #include "grit/locale_settings.h" |
42 #include "net/base/escape.h" | 41 #include "net/base/escape.h" |
43 #include "net/base/load_flags.h" | 42 #include "net/base/load_flags.h" |
44 #include "net/url_request/url_request_job.h" | 43 #include "net/url_request/url_request_job.h" |
| 44 #include "ui/base/resource/resource_bundle.h" |
45 | 45 |
46 #if defined(OS_CHROMEOS) | 46 #if defined(OS_CHROMEOS) |
47 #include "chrome/browser/chromeos/frame/panel_browser_view.h" | 47 #include "chrome/browser/chromeos/frame/panel_browser_view.h" |
48 #endif | 48 #endif |
49 | 49 |
50 static const char kPropertyPath[] = "path"; | 50 static const char kPropertyPath[] = "path"; |
51 static const char kPropertyForce[] = "force"; | 51 static const char kPropertyForce[] = "force"; |
52 static const char kPropertyOffset[] = "currentOffset"; | 52 static const char kPropertyOffset[] = "currentOffset"; |
53 static const char kPropertyError[] = "error"; | 53 static const char kPropertyError[] = "error"; |
54 | 54 |
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
612 new MediaplayerUIHTMLSource(is_playlist); | 612 new MediaplayerUIHTMLSource(is_playlist); |
613 | 613 |
614 // Set up the chrome://mediaplayer/ source. | 614 // Set up the chrome://mediaplayer/ source. |
615 BrowserThread::PostTask( | 615 BrowserThread::PostTask( |
616 BrowserThread::IO, FROM_HERE, | 616 BrowserThread::IO, FROM_HERE, |
617 NewRunnableMethod( | 617 NewRunnableMethod( |
618 ChromeURLDataManager::GetInstance(), | 618 ChromeURLDataManager::GetInstance(), |
619 &ChromeURLDataManager::AddDataSource, | 619 &ChromeURLDataManager::AddDataSource, |
620 make_scoped_refptr(html_source))); | 620 make_scoped_refptr(html_source))); |
621 } | 621 } |
OLD | NEW |