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

Unified Diff: chrome/browser/net/net_error_tab_helper.cc

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/net/net_error_tab_helper.cc
diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc
index a0e73cf6cb1e2c50084dc6ce1a1817860884b2fe..b9b3c8fd4b0a9e62f6cc33505a4c72e6081ee818 100644
--- a/chrome/browser/net/net_error_tab_helper.cc
+++ b/chrome/browser/net/net_error_tab_helper.cc
@@ -22,7 +22,7 @@
#include "net/base/net_errors.h"
#include "url/gurl.h"
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
#include "chrome/browser/android/tab_android.h"
#endif
@@ -123,7 +123,7 @@ void NetErrorTabHelper::DidStartProvisionalLoadForFrame(
is_error_page_ = is_error_page;
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
SetHasOfflinePages(render_frame_host);
#endif
}
@@ -175,7 +175,7 @@ bool NetErrorTabHelper::OnMessageReceived(
IPC_BEGIN_MESSAGE_MAP(NetErrorTabHelper, message)
IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RunNetworkDiagnostics,
RunNetworkDiagnostics)
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ShowOfflinePages, ShowOfflinePages)
#endif
IPC_MESSAGE_UNHANDLED(handled = false)
@@ -285,7 +285,7 @@ void NetErrorTabHelper::RunNetworkDiagnosticsHelper(
ShowNetworkDiagnosticsDialog(web_contents(), sanitized_url);
}
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
void NetErrorTabHelper::SetHasOfflinePages(
content::RenderFrameHost* render_frame_host) {
DCHECK(web_contents());

Powered by Google App Engine
This is Rietveld 408576698