chrome/browser/android/tab_android.cc - Issue 646943005: Make GetSecurityLevel available from the java ToolbarModel.

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

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

Issue 646943005: Make GetSecurityLevel available from the java ToolbarModel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moved null check Created 6 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/android/tab_android.cc

diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc

index 3d187211f790355d983d40de04af509f68b06b3b..9bafe7746a5c25e51b2f278e2e5c870b152e2941 100644

--- a/chrome/browser/android/tab_android.cc

+++ b/chrome/browser/android/tab_android.cc

@@ -36,7 +36,6 @@

#include "chrome/browser/ui/search/search_tab_helper.h"

#include "chrome/browser/ui/tab_contents/core_tab_helper.h"

#include "chrome/browser/ui/tab_helpers.h"

-#include "chrome/browser/ui/toolbar/toolbar_model_impl.h"

#include "chrome/common/url_constants.h"

#include "components/google/core/browser/google_url_tracker.h"

#include "components/google/core/browser/google_util.h"

@@ -555,11 +554,6 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env,

return DEFAULT_PAGE_LOAD;

}

-ToolbarModel::SecurityLevel TabAndroid::GetSecurityLevel(JNIEnv* env,

- jobject obj) {

- return ToolbarModelImpl::GetSecurityLevelForWebContents(web_contents());

void TabAndroid::SetActiveNavigationEntryTitleForUrl(JNIEnv* env,

jobject obj,

jstring jurl,

« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | chrome/browser/ui/android/toolbar/toolbar_model_android.cc » ('j') | no next file with comments »