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

Side by Side Diff: chrome/browser/media/android/router/media_router_android.cc

Issue 2801033002: Revert of Android: Remove GetApplicationContext part 2 (Closed)
Patch Set: Created 3 years, 8 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/media/android/router/media_router_android.h" 5 #include "chrome/browser/media/android/router/media_router_android.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/android/context_utils.h"
11 #include "base/android/jni_android.h" 12 #include "base/android/jni_android.h"
12 #include "base/android/jni_array.h" 13 #include "base/android/jni_array.h"
13 #include "base/android/jni_string.h" 14 #include "base/android/jni_string.h"
14 #include "base/guid.h" 15 #include "base/guid.h"
15 #include "base/logging.h" 16 #include "base/logging.h"
16 #include "base/memory/ptr_util.h" 17 #include "base/memory/ptr_util.h"
17 #include "chrome/browser/android/tab_android.h" 18 #include "chrome/browser/android/tab_android.h"
18 #include "chrome/browser/media/router/media_routes_observer.h" 19 #include "chrome/browser/media/router/media_routes_observer.h"
19 #include "chrome/browser/media/router/media_sinks_observer.h" 20 #include "chrome/browser/media/router/media_sinks_observer.h"
20 #include "chrome/browser/media/router/route_message.h" 21 #include "chrome/browser/media/router/route_message.h"
(...skipping 17 matching lines...) Expand all
38 const std::vector<MediaRouteResponseCallback>& callbacks) 39 const std::vector<MediaRouteResponseCallback>& callbacks)
39 : media_source(source), 40 : media_source(source),
40 presentation_id(presentation_id), 41 presentation_id(presentation_id),
41 callbacks(callbacks) {} 42 callbacks(callbacks) {}
42 43
43 MediaRouterAndroid::MediaRouteRequest::~MediaRouteRequest() {} 44 MediaRouterAndroid::MediaRouteRequest::~MediaRouteRequest() {}
44 45
45 46
46 MediaRouterAndroid::MediaRouterAndroid(content::BrowserContext*) { 47 MediaRouterAndroid::MediaRouterAndroid(content::BrowserContext*) {
47 JNIEnv* env = base::android::AttachCurrentThread(); 48 JNIEnv* env = base::android::AttachCurrentThread();
48 java_media_router_.Reset( 49 java_media_router_.Reset(Java_ChromeMediaRouter_create(
49 Java_ChromeMediaRouter_create(env, reinterpret_cast<jlong>(this))); 50 env,
51 reinterpret_cast<jlong>(this),
52 base::android::GetApplicationContext()));
50 } 53 }
51 54
52 MediaRouterAndroid::~MediaRouterAndroid() { 55 MediaRouterAndroid::~MediaRouterAndroid() {
53 } 56 }
54 57
55 // static 58 // static
56 bool MediaRouterAndroid::Register(JNIEnv* env) { 59 bool MediaRouterAndroid::Register(JNIEnv* env) {
57 bool ret = RegisterNativesImpl(env); 60 bool ret = RegisterNativesImpl(env);
58 DCHECK(g_ChromeMediaRouter_clazz); 61 DCHECK(g_ChromeMediaRouter_clazz);
59 return ret; 62 return ret;
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 return; 430 return;
428 431
429 std::vector<RouteMessage> messages(1); 432 std::vector<RouteMessage> messages(1);
430 messages.front().type = RouteMessage::TEXT; 433 messages.front().type = RouteMessage::TEXT;
431 messages.front().text = ConvertJavaStringToUTF8(env, jmessage); 434 messages.front().text = ConvertJavaStringToUTF8(env, jmessage);
432 for (auto& observer : *it->second.get()) 435 for (auto& observer : *it->second.get())
433 observer.OnMessagesReceived(messages); 436 observer.OnMessagesReceived(messages);
434 } 437 }
435 438
436 } // namespace media_router 439 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698