Commit c797f935 authored by Mugdha Lakhani's avatar Mugdha Lakhani Committed by Commit Bot

[WebLayer] Remove chrome deps from PageInfoControllerAndroid.

This removes all dependencies on chrome:// from PageInfoControllerAndroid
except for the dependency on the JNI header for its java counterpart. We
can remove this once the java counterpart is ready to be moved to
components.

Bug: 1052375
Change-Id: I26e21019655d7099f89e16d481789f1afb1736d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2137323
Commit-Queue: Mugdha Lakhani <nator@chromium.org>
Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757113}
parent 14ddb2ec
...@@ -10,12 +10,10 @@ ...@@ -10,12 +10,10 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "chrome/android/chrome_jni_headers/PageInfoController_jni.h" #include "chrome/android/chrome_jni_headers/PageInfoController_jni.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/ui/page_info/chrome_page_info_delegate.h"
#include "chrome/common/chrome_features.h"
#include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_types.h" #include "components/content_settings/core/common/content_settings_types.h"
#include "components/page_info/android/page_info_client.h"
#include "components/page_info/page_info.h" #include "components/page_info/page_info.h"
#include "components/page_info/page_info_ui.h" #include "components/page_info/page_info_ui.h"
#include "components/security_state/core/security_state.h" #include "components/security_state/core/security_state.h"
...@@ -58,8 +56,10 @@ PageInfoControllerAndroid::PageInfoControllerAndroid( ...@@ -58,8 +56,10 @@ PageInfoControllerAndroid::PageInfoControllerAndroid(
controller_jobject_.Reset(env, java_page_info_pop); controller_jobject_.Reset(env, java_page_info_pop);
page_info::PageInfoClient* page_info_client = page_info::GetPageInfoClient();
DCHECK(page_info_client);
presenter_ = std::make_unique<PageInfo>( presenter_ = std::make_unique<PageInfo>(
std::make_unique<ChromePageInfoDelegate>(web_contents), web_contents, page_info_client->CreatePageInfoDelegate(web_contents), web_contents,
nav_entry->GetURL()); nav_entry->GetURL());
presenter_->InitializeUiState(this); presenter_->InitializeUiState(this);
} }
......
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