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

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

Issue 2233023002: Adding BlimpNavigationController to Tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nav_handler_remove
Patch Set: Fixing unit tests Created 4 years, 4 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
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 8ea0ba7331a5677717088ce2930763481bfdb333..63cbe9f53e5679bef3c7a9846e7ef3c0b89e8e5a 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -11,7 +11,11 @@
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram.h"
#include "base/trace_event/trace_event.h"
+#include "blimp/client/public/blimp_client_context.h"
+#include "blimp/client/public/contents/blimp_contents.h"
+#include "blimp/client/public/contents/blimp_navigation_controller.h"
#include "cc/layers/layer.h"
+#include "chrome/browser/android/blimp/blimp_client_context_factory.h"
#include "chrome/browser/android/compositor/tab_content_manager.h"
#include "chrome/browser/android/metrics/uma_utils.h"
#include "chrome/browser/android/offline_pages/offline_page_bridge.h"
@@ -30,6 +34,7 @@
#include "chrome/browser/printing/print_view_manager_basic.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_android.h"
+#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/search/instant_service.h"
#include "chrome/browser/search/instant_service_factory.h"
#include "chrome/browser/search/search.h"
@@ -414,6 +419,20 @@ void TabAndroid::InitWebContents(
content_layer_->InsertChild(web_contents_->GetNativeView()->GetLayer(), 0);
}
+base::android::ScopedJavaLocalRef<jobject> TabAndroid::InitBlimpContents(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& obj,
+ const JavaParamRef<jobject>& j_profile) {
+ Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile.obj());
+ DCHECK(!profile->IsOffTheRecord());
+ blimp::client::BlimpClientContext* context =
+ BlimpClientContextFactory::GetForBrowserContext(profile);
+ DCHECK(context);
+ blimp_contents_ = context->CreateBlimpContents();
+ DCHECK(blimp_contents_);
+ return blimp_contents_->GetJavaObject();
+}
+
void TabAndroid::UpdateDelegates(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
@@ -557,6 +576,11 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(
content::RecordAction(base::UserMetricsAction("ShowHistory"));
}
+ if (blimp_contents()) {
+ blimp_contents()->GetNavigationController().LoadURL(fixed_url);
+ return DEFAULT_PAGE_LOAD;
+ }
+
content::NavigationController::LoadURLParams load_params(fixed_url);
if (j_extra_headers) {
load_params.extra_headers = base::android::ConvertJavaStringToUTF8(
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698