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

Side by Side Diff: webkit/glue/media/simple_data_source.cc

Issue 6628020: Cleaning up src/media to be consistent with static versus anonymous namespaces. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: fix namespaces Created 9 years, 9 months 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) 2010 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 "webkit/glue/media/simple_data_source.h" 5 #include "webkit/glue/media/simple_data_source.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/process_util.h" 8 #include "base/process_util.h"
9 #include "media/base/filter_host.h" 9 #include "media/base/filter_host.h"
10 #include "net/base/data_url.h" 10 #include "net/base/data_url.h"
11 #include "net/base/load_flags.h" 11 #include "net/base/load_flags.h"
12 #include "net/url_request/url_request_status.h" 12 #include "net/url_request/url_request_status.h"
13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h" 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h"
15 #include "webkit/glue/webkit_glue.h" 15 #include "webkit/glue/webkit_glue.h"
16 16
17 namespace { 17 namespace webkit_glue {
18 18
19 const char kDataScheme[] = "data"; 19 static const char kDataScheme[] = "data";
20
21 } // namespace
22
23 namespace webkit_glue {
24 20
25 SimpleDataSource::SimpleDataSource( 21 SimpleDataSource::SimpleDataSource(
26 MessageLoop* render_loop, 22 MessageLoop* render_loop,
27 WebKit::WebFrame* frame) 23 WebKit::WebFrame* frame)
28 : render_loop_(render_loop), 24 : render_loop_(render_loop),
29 frame_(frame), 25 frame_(frame),
30 size_(-1), 26 size_(-1),
31 single_origin_(true), 27 single_origin_(true),
32 state_(UNINITIALIZED), 28 state_(UNINITIALIZED),
33 keep_test_loader_(false) { 29 keep_test_loader_(false) {
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 // If scheme is file or data, say we are loaded. 272 // If scheme is file or data, say we are loaded.
277 host()->SetLoaded(url_.SchemeIsFile() || url_.SchemeIs(kDataScheme)); 273 host()->SetLoaded(url_.SchemeIsFile() || url_.SchemeIs(kDataScheme));
278 } else { 274 } else {
279 host()->SetError(media::PIPELINE_ERROR_NETWORK); 275 host()->SetError(media::PIPELINE_ERROR_NETWORK);
280 } 276 }
281 initialize_callback_->Run(); 277 initialize_callback_->Run();
282 initialize_callback_.reset(); 278 initialize_callback_.reset();
283 } 279 }
284 280
285 } // namespace webkit_glue 281 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698