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

Side by Side Diff: content/browser/android/web_contents_observer_proxy.h

Issue 2411723002: Split MediaSessionStateChanged() and MediaSessionMetadataChanged() (Closed)
Patch Set: rebased and addressed Anton's comments Created 4 years, 2 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 #ifndef CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_
6 #define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_ 6 #define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 void DocumentLoadedInFrame(RenderFrameHost* render_frame_host) override; 65 void DocumentLoadedInFrame(RenderFrameHost* render_frame_host) override;
66 void NavigationEntryCommitted( 66 void NavigationEntryCommitted(
67 const LoadCommittedDetails& load_details) override; 67 const LoadCommittedDetails& load_details) override;
68 void WebContentsDestroyed() override; 68 void WebContentsDestroyed() override;
69 void DidAttachInterstitialPage() override; 69 void DidAttachInterstitialPage() override;
70 void DidDetachInterstitialPage() override; 70 void DidDetachInterstitialPage() override;
71 void DidChangeThemeColor(SkColor color) override; 71 void DidChangeThemeColor(SkColor color) override;
72 void DidStartNavigationToPendingEntry( 72 void DidStartNavigationToPendingEntry(
73 const GURL& url, 73 const GURL& url,
74 ReloadType reload_type) override; 74 ReloadType reload_type) override;
75 void MediaSessionStateChanged( 75 void MediaSessionStateChanged(bool is_controllable,
76 bool is_controllable, 76 bool is_suspended) override;
77 bool is_suspended, 77 void MediaSessionMetadataChanged(
78 const base::Optional<MediaMetadata>& metadata) override; 78 const base::Optional<MediaMetadata>& metadata) override;
clamy 2016/10/12 11:43:50 Considering that this is an optional parameter, co
Zhiqiang Zhang (Slow) 2016/10/12 12:08:27 As I said in the other reply, `nullopt` metadata i
clamy 2016/10/12 12:25:04 Acknowledged.
clamy 2016/10/12 11:43:50 Now that it moves to its own function, should meta
Zhiqiang Zhang (Slow) 2016/10/12 12:08:27 Not in our case. `metadata` is passed from Blink,
clamy 2016/10/12 12:25:04 Acknowledged.
79 void SetToBaseURLForDataURLIfNeeded(std::string* url); 79 void SetToBaseURLForDataURLIfNeeded(std::string* url);
80 80
81 void DidFailLoadInternal(bool is_provisional_load, 81 void DidFailLoadInternal(bool is_provisional_load,
82 bool is_main_frame, 82 bool is_main_frame,
83 int error_code, 83 int error_code,
84 const base::string16& description, 84 const base::string16& description,
85 const GURL& url, 85 const GURL& url,
86 bool was_ignored_by_handler); 86 bool was_ignored_by_handler);
87 87
88 base::android::ScopedJavaGlobalRef<jobject> java_observer_; 88 base::android::ScopedJavaGlobalRef<jobject> java_observer_;
89 GURL base_url_of_last_started_data_url_; 89 GURL base_url_of_last_started_data_url_;
90 90
91 DISALLOW_COPY_AND_ASSIGN(WebContentsObserverProxy); 91 DISALLOW_COPY_AND_ASSIGN(WebContentsObserverProxy);
92 }; 92 };
93 93
94 bool RegisterWebContentsObserverProxy(JNIEnv* env); 94 bool RegisterWebContentsObserverProxy(JNIEnv* env);
95 } // namespace content 95 } // namespace content
96 96
97 #endif // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_ 97 #endif // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698