Commit 3ebe17ec authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Solving jumbo build offline_pages clash with base::DoNothing()

Too many SavePageLaterCallback functions caused problems in
jumbo builds. Since two of the three were just empty functions
this patch replaces them with base::DoNothing()

Change-Id: Ie9c939ee10674cdab77aab0a9ade65d70293fb0c
Reviewed-on: https://chromium-review.googlesource.com/964441Reviewed-by: default avatarCathy Li <chili@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#543397}
parent ae7b6de6
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/android/jni_string.h" #include "base/android/jni_string.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/guid.h" #include "base/guid.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
...@@ -107,10 +108,6 @@ content::WebContents* GetWebContentsFromJavaTab( ...@@ -107,10 +108,6 @@ content::WebContents* GetWebContentsFromJavaTab(
return tab->web_contents(); return tab->web_contents();
} }
void SavePageLaterCallback(AddRequestResult result) {
// do nothing.
}
void SavePageIfNotNavigatedAway(const GURL& url, void SavePageIfNotNavigatedAway(const GURL& url,
const GURL& original_url, const GURL& original_url,
const ScopedJavaGlobalRef<jobject>& j_tab_ref, const ScopedJavaGlobalRef<jobject>& j_tab_ref,
...@@ -147,8 +144,8 @@ void SavePageIfNotNavigatedAway(const GURL& url, ...@@ -147,8 +144,8 @@ void SavePageIfNotNavigatedAway(const GURL& url,
RequestCoordinator::RequestAvailability::DISABLED_FOR_OFFLINER; RequestCoordinator::RequestAvailability::DISABLED_FOR_OFFLINER;
params.original_url = original_url; params.original_url = original_url;
params.request_origin = origin; params.request_origin = origin;
request_id = request_coordinator->SavePageLater( request_id =
params, base::Bind(&SavePageLaterCallback)); request_coordinator->SavePageLater(params, base::DoNothing());
} else { } else {
DVLOG(1) << "SavePageIfNotNavigatedAway has no valid coordinator."; DVLOG(1) << "SavePageIfNotNavigatedAway has no valid coordinator.";
} }
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "chrome/browser/offline_pages/offline_page_tab_helper.h" #include "chrome/browser/offline_pages/offline_page_tab_helper.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/guid.h" #include "base/guid.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
...@@ -41,10 +42,6 @@ bool SchemeIsForUntrustedOfflinePages(const GURL& url) { ...@@ -41,10 +42,6 @@ bool SchemeIsForUntrustedOfflinePages(const GURL& url) {
#endif #endif
return url.SchemeIsFile(); return url.SchemeIsFile();
} }
void SavePageLaterCallback(AddRequestResult result) {
// do nothing.
}
} // namespace } // namespace
OfflinePageTabHelper::LoadedOfflinePageInfo::LoadedOfflinePageInfo() OfflinePageTabHelper::LoadedOfflinePageInfo::LoadedOfflinePageInfo()
...@@ -388,8 +385,7 @@ void OfflinePageTabHelper::DoDownloadPageLater( ...@@ -388,8 +385,7 @@ void OfflinePageTabHelper::DoDownloadPageLater(
params.url = url; params.url = url;
params.client_id = offline_pages::ClientId(name_space, base::GenerateGUID()); params.client_id = offline_pages::ClientId(name_space, base::GenerateGUID());
params.request_origin = request_origin; params.request_origin = request_origin;
request_coordinator->SavePageLater(params, request_coordinator->SavePageLater(params, base::DoNothing());
base::Bind(&SavePageLaterCallback));
if (static_cast<int>(ui_action) & if (static_cast<int>(ui_action) &
static_cast<int>(OfflinePageUtils::DownloadUIActionFlags:: static_cast<int>(OfflinePageUtils::DownloadUIActionFlags::
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment