chrome/browser/ui/website_settings/website_settings.cc - Issue 1459793002: Android: Allow compiling browser without Java UI

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/ui/website_settings/website_settings.cc

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index a82135ae415194275bef9dde9d413e7b979441ea..c717aac581046759c00b881708a21035c286dfc2 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -30,6 +30,7 @@

#include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"

#include "chrome/browser/ui/website_settings/website_settings_ui.h"

#include "chrome/common/chrome_switches.h"

+#include "chrome/common/features.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "chrome/grit/chromium_strings.h"

@@ -313,7 +314,7 @@ void WebsiteSettings::Init(

const GURL& url,

const SecurityStateModel::SecurityInfo& security_info) {

bool isChromeUINativeScheme = false;

-#if defined(OS_ANDROID)

+#if BUILDFLAG(ANDROID_JAVA_UI)

isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme);

#endif