Commit 765e94d9 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/browser/ui/webui/ntp_tiles_internals_ui.cc

The ChromeBrowserState has been moved from the "ios" namespace
to the global namespace by http://crrev.com/c/2014913. Fix the
uses from ios::ChromeBrowserState to ChromeBrowserState.

Also remove includes of chrome_browser_state_forward.h and use
a simple forward declaration instead (since the old name is no
longer necessary).

This CL was uploaded by git cl split.

R=kristipark@chromium.org

Bug: 1042208
Change-Id: I8d298e96a77675a29a02e1bef5df5f1ab67df2ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2015171Reviewed-by: default avatarKristi Park <kristipark@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735281}
parent aa55fa24
...@@ -61,7 +61,7 @@ void IOSNTPTilesInternalsMessageHandlerBridge::RegisterMessages() { ...@@ -61,7 +61,7 @@ void IOSNTPTilesInternalsMessageHandlerBridge::RegisterMessages() {
} }
bool IOSNTPTilesInternalsMessageHandlerBridge::SupportsNTPTiles() { bool IOSNTPTilesInternalsMessageHandlerBridge::SupportsNTPTiles() {
return !ios::ChromeBrowserState::FromWebUIIOS(web_ui())->IsOffTheRecord(); return !ChromeBrowserState::FromWebUIIOS(web_ui())->IsOffTheRecord();
} }
bool IOSNTPTilesInternalsMessageHandlerBridge::DoesSourceExist( bool IOSNTPTilesInternalsMessageHandlerBridge::DoesSourceExist(
...@@ -85,11 +85,11 @@ bool IOSNTPTilesInternalsMessageHandlerBridge::DoesSourceExist( ...@@ -85,11 +85,11 @@ bool IOSNTPTilesInternalsMessageHandlerBridge::DoesSourceExist(
std::unique_ptr<ntp_tiles::MostVisitedSites> std::unique_ptr<ntp_tiles::MostVisitedSites>
IOSNTPTilesInternalsMessageHandlerBridge::MakeMostVisitedSites() { IOSNTPTilesInternalsMessageHandlerBridge::MakeMostVisitedSites() {
return IOSMostVisitedSitesFactory::NewForBrowserState( return IOSMostVisitedSitesFactory::NewForBrowserState(
ios::ChromeBrowserState::FromWebUIIOS(web_ui())); ChromeBrowserState::FromWebUIIOS(web_ui()));
} }
PrefService* IOSNTPTilesInternalsMessageHandlerBridge::GetPrefs() { PrefService* IOSNTPTilesInternalsMessageHandlerBridge::GetPrefs() {
return ios::ChromeBrowserState::FromWebUIIOS(web_ui())->GetPrefs(); return ChromeBrowserState::FromWebUIIOS(web_ui())->GetPrefs();
} }
void IOSNTPTilesInternalsMessageHandlerBridge::RegisterMessageCallback( void IOSNTPTilesInternalsMessageHandlerBridge::RegisterMessageCallback(
...@@ -119,8 +119,7 @@ web::WebUIIOSDataSource* CreateNTPTilesInternalsHTMLSource() { ...@@ -119,8 +119,7 @@ web::WebUIIOSDataSource* CreateNTPTilesInternalsHTMLSource() {
NTPTilesInternalsUI::NTPTilesInternalsUI(web::WebUIIOS* web_ui) NTPTilesInternalsUI::NTPTilesInternalsUI(web::WebUIIOS* web_ui)
: web::WebUIIOSController(web_ui) { : web::WebUIIOSController(web_ui) {
ios::ChromeBrowserState* browser_state = ChromeBrowserState* browser_state = ChromeBrowserState::FromWebUIIOS(web_ui);
ios::ChromeBrowserState::FromWebUIIOS(web_ui);
web::WebUIIOSDataSource::Add(browser_state, web::WebUIIOSDataSource::Add(browser_state,
CreateNTPTilesInternalsHTMLSource()); CreateNTPTilesInternalsHTMLSource());
web_ui->AddMessageHandler( web_ui->AddMessageHandler(
......
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