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

Unified Diff: ios/chrome/browser/web/chrome_web_client.mm

Issue 2705293014: Created web::UserAgentType. (Closed)
Patch Set: self review Created 3 years, 10 months 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: ios/chrome/browser/web/chrome_web_client.mm
diff --git a/ios/chrome/browser/web/chrome_web_client.mm b/ios/chrome/browser/web/chrome_web_client.mm
index ccf042f332e166d5afd3775ff80fd8170d17cb16..f51bfe882deec7afe9b8ab565c60d4bb2dd1cbe1 100644
--- a/ios/chrome/browser/web/chrome_web_client.mm
+++ b/ios/chrome/browser/web/chrome_web_client.mm
@@ -108,12 +108,17 @@
return product;
}
-std::string ChromeWebClient::GetUserAgent(bool desktop_user_agent) const {
+std::string ChromeWebClient::GetUserAgent(web::UserAgentType type) const {
+ // The user agent should not be requested for app-specific URLs.
+ if (type == web::UserAgentType::NONE) {
+ NOTREACHED();
+ return std::string();
liaoyuke 2017/02/25 01:28:19 Do we really need this return statement?
kkhorimoto 2017/02/25 01:35:05 Yes, NOTREACHED() does nothing in non-debug builds
liaoyuke 2017/02/25 01:40:55 I think it will compile even without this return,
kkhorimoto 2017/02/25 01:52:09 It will compile, but it will return the wrong valu
+ }
+
// Using desktop user agent overrides a command-line user agent, so that
// request desktop site can still work when using an overridden UA.
- if (desktop_user_agent) {
+ if (type == web::UserAgentType::DESKTOP)
return base::SysNSStringToUTF8(ChromeWebView::kDesktopUserAgent);
- }
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kUserAgent)) {

Powered by Google App Engine
This is Rietveld 408576698