media/base/android/media_drm_bridge.cc - Issue 89243003: Move EmptyString, kWhitespace and the BOM to base.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/base/android/media_drm_bridge.cc

Issue 89243003: Move EmptyString, kWhitespace and the BOM to base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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

« no previous file with comments | « gpu/command_buffer/service/gpu_tracer.cc ('k') | net/ftp/ftp_network_transaction.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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 "media/base/android/media_drm_bridge.h"	5 #include "media/base/android/media_drm_bridge.h"

6	6

7 #include "base/android/build_info.h"	7 #include "base/android/build_info.h"

8 #include "base/android/jni_array.h"	8 #include "base/android/jni_array.h"

9 #include "base/android/jni_string.h"	9 #include "base/android/jni_string.h"

10 #include "base/callback_helpers.h"	10 #include "base/callback_helpers.h"

(...skipping 374 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
385 DCHECK(!session_id.empty());	385 DCHECK(!session_id.empty());

386 session_map_[reference_id] = session_id;	386 session_map_[reference_id] = session_id;

387 }	387 }

388	388

389 return reference_id;	389 return reference_id;

390 }	390 }

391	391

392 const std::string& MediaDrmBridge::LookupSessionId(uint32 reference_id) {	392 const std::string& MediaDrmBridge::LookupSessionId(uint32 reference_id) {

393 // Session may not exist if error happens during GenerateKeyRequest().	393 // Session may not exist if error happens during GenerateKeyRequest().

394 SessionMap::iterator it = session_map_.find(reference_id);	394 SessionMap::iterator it = session_map_.find(reference_id);

395 return (it != session_map_.end()) ? it->second : EmptyString();	395 return (it != session_map_.end()) ? it->second : base::EmptyString();

396 }	396 }

397	397

398 } // namespace media	398 } // namespace media

OLD	NEW