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

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

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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) 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
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) && defined(TOOLKIT_USES_GTK) 48 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
49 #include "chrome/browser/chromeos/frame/panel_browser_view.h" 49 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
50 #endif 50 #endif
51 51
52 using content::BrowserThread;
53
52 static const char* kMediaPlayerAppName = "mediaplayer"; 54 static const char* kMediaPlayerAppName = "mediaplayer";
53 static const int kPopupLeft = 0; 55 static const int kPopupLeft = 0;
54 static const int kPopupTop = 0; 56 static const int kPopupTop = 0;
55 static const int kPopupWidth = 350; 57 static const int kPopupWidth = 350;
56 static const int kPopupHeight = 300; 58 static const int kPopupHeight = 300;
57 59
58 const MediaPlayer::UrlVector& MediaPlayer::GetPlaylist() const { 60 const MediaPlayer::UrlVector& MediaPlayer::GetPlaylist() const {
59 return current_playlist_; 61 return current_playlist_;
60 } 62 }
61 63
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 295
294 MediaPlayer::MediaPlayer() 296 MediaPlayer::MediaPlayer()
295 : current_position_(0), 297 : current_position_(0),
296 pending_playback_request_(false), 298 pending_playback_request_(false),
297 playlist_browser_(NULL), 299 playlist_browser_(NULL),
298 mediaplayer_browser_(NULL) { 300 mediaplayer_browser_(NULL) {
299 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) {
300 supported_mime_types_.insert(supported_mime_type_list[i]); 302 supported_mime_types_.insert(supported_mime_type_list[i]);
301 } 303 }
302 }; 304 };
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/chromeos/mobile_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698