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

Unified Diff: ios/web/history_state_util.cc

Issue 2511993004: [ObjC ARC] Converts ios/web:core to ARC.Automatically generated ARCMigrate commitNotable issues:… (Closed)
Patch Set: rename variables Created 4 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
« no previous file with comments | « ios/web/crw_network_activity_indicator_manager.mm ('k') | ios/web/history_state_util.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/history_state_util.cc
diff --git a/ios/web/history_state_util.mm b/ios/web/history_state_util.cc
similarity index 55%
rename from ios/web/history_state_util.mm
rename to ios/web/history_state_util.cc
index bdb11bce32bd95b82d608ffe1d2d0666e19ffa39..1b10554924fcf1faf627d775451147f622d90f92 100644
--- a/ios/web/history_state_util.mm
+++ b/ios/web/history_state_util.cc
@@ -10,27 +10,26 @@
namespace web {
namespace history_state_util {
-bool IsHistoryStateChangeValid(const GURL& currentUrl,
- const GURL& toUrl) {
+bool IsHistoryStateChangeValid(const GURL& current_url, const GURL& to_url) {
// These two checks are very important to the security of the page. We cannot
// allow the page to change the state to an invalid URL.
- CHECK(currentUrl.is_valid());
- CHECK(toUrl.is_valid());
+ CHECK(current_url.is_valid());
+ CHECK(to_url.is_valid());
- return toUrl.GetOrigin() == currentUrl.GetOrigin();
+ return to_url.GetOrigin() == current_url.GetOrigin();
}
-GURL GetHistoryStateChangeUrl(const GURL& currentUrl,
- const GURL& baseUrl,
+GURL GetHistoryStateChangeUrl(const GURL& current_url,
+ const GURL& base_url,
const std::string& destination) {
- if (!baseUrl.is_valid())
+ if (!base_url.is_valid())
return GURL();
- GURL toUrl = baseUrl.Resolve(destination);
+ GURL to_url = base_url.Resolve(destination);
- if (!toUrl.is_valid() || !IsHistoryStateChangeValid(currentUrl, toUrl))
+ if (!to_url.is_valid() || !IsHistoryStateChangeValid(current_url, to_url))
return GURL();
- return toUrl;
+ return to_url;
}
} // namespace history_state_util
« no previous file with comments | « ios/web/crw_network_activity_indicator_manager.mm ('k') | ios/web/history_state_util.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698