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

Unified Diff: chrome/browser/android/tab_android.h

Issue 2623023002: Remove //chrome as an embedder of blimp. (Closed)
Patch Set: One more rebase for good measure Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/tab_android.h
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index 1bdebccc7d4f0ac77f5d43bacbb51102ab3cc56e..4669c9dbed867b91ce189a5e7260549f1221aac4 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h
@@ -27,12 +27,6 @@
class GURL;
class Profile;
-namespace blimp {
-namespace client {
-class BlimpContents;
-}
-}
-
namespace cc {
class Layer;
}
@@ -87,11 +81,6 @@ class TabAndroid : public CoreTabHelperDelegate,
// Return the WebContents, if any, currently owned by this TabAndroid.
content::WebContents* web_contents() const { return web_contents_.get(); }
- // Return the BlimpContents, if any, currently owned by this TabAndroid.
- blimp::client::BlimpContents* blimp_contents() const {
- return blimp_contents_.get();
- }
-
// Return the cc::Layer that represents the content for this TabAndroid.
scoped_refptr<cc::Layer> GetContentLayer() const;
@@ -153,11 +142,6 @@ class TabAndroid : public CoreTabHelperDelegate,
const base::android::JavaParamRef<jobject>& jweb_contents,
const base::android::JavaParamRef<jobject>& jweb_contents_delegate,
const base::android::JavaParamRef<jobject>& jcontext_menu_populator);
- base::android::ScopedJavaLocalRef<jobject> InitBlimpContents(
- JNIEnv* env,
- const base::android::JavaParamRef<jobject>& obj,
- const base::android::JavaParamRef<jobject>& j_profile,
- jlong window_android_ptr);
void UpdateDelegates(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
@@ -266,8 +250,6 @@ class TabAndroid : public CoreTabHelperDelegate,
std::unique_ptr<android::TabWebContentsDelegateAndroid>
web_contents_delegate_;
- std::unique_ptr<blimp::client::BlimpContents> blimp_contents_;
-
std::unique_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
DISALLOW_COPY_AND_ASSIGN(TabAndroid);
« no previous file with comments | « chrome/browser/android/preferences/command_line_pref_store_android.cc ('k') | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698