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

Unified Diff: ios/chrome/browser/about_flags.mm

Issue 2569663002: Convert //ios/chrome/browser:about_flags to use buildflag_header. (Closed)
Patch Set: Created 4 years 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/chrome/browser/BUILD.gn ('k') | ios/chrome/browser/ui/webui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/about_flags.mm
diff --git a/ios/chrome/browser/about_flags.mm b/ios/chrome/browser/about_flags.mm
index eb01c74ff6b4711f5e7c3587d9fbbfd35a2063bd..4fbfd94f8c094bd904a8897c74c8dbf4201b0ae3 100644
--- a/ios/chrome/browser/about_flags.mm
+++ b/ios/chrome/browser/about_flags.mm
@@ -31,6 +31,7 @@
#include "components/sync/driver/sync_driver_switches.h"
#include "google_apis/gaia/gaia_switches.h"
#include "ios/chrome/browser/chrome_switches.h"
+#include "ios/chrome/browser/google_api_keys.h"
#include "ios/chrome/grit/ios_strings.h"
#include "ios/web/public/user_agent.h"
#include "ios/web/public/web_view_creation_util.h"
@@ -39,10 +40,6 @@
#include "components/variations/variations_switches.h"
#endif
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
namespace {
// To add a new entry, add to the end of kFeatureEntries. There are two
// distinct types of entries:
@@ -79,19 +76,22 @@ void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) {
NSString* gaia_environment = [defaults stringForKey:kGAIAEnvironment];
if ([gaia_environment isEqualToString:@"Staging"]) {
command_line->AppendSwitchASCII(switches::kGoogleApisUrl,
- GOOGLE_STAGING_API_URL);
- command_line->AppendSwitchASCII(switches::kLsoUrl, GOOGLE_STAGING_LSO_URL);
+ BUILDFLAG(GOOGLE_STAGING_API_URL));
+ command_line->AppendSwitchASCII(switches::kLsoUrl,
+ BUILDFLAG(GOOGLE_STAGING_LSO_URL));
} else if ([gaia_environment isEqualToString:@"Test"]) {
- command_line->AppendSwitchASCII(switches::kGaiaUrl, GOOGLE_TEST_OAUTH_URL);
+ command_line->AppendSwitchASCII(switches::kGaiaUrl,
+ BUILDFLAG(GOOGLE_TEST_OAUTH_URL));
command_line->AppendSwitchASCII(switches::kGoogleApisUrl,
- GOOGLE_TEST_API_URL);
- command_line->AppendSwitchASCII(switches::kLsoUrl, GOOGLE_TEST_LSO_URL);
+ BUILDFLAG(GOOGLE_TEST_API_URL));
+ command_line->AppendSwitchASCII(switches::kLsoUrl,
+ BUILDFLAG(GOOGLE_TEST_LSO_URL));
command_line->AppendSwitchASCII(switches::kSyncServiceURL,
- GOOGLE_TEST_SYNC_URL);
+ BUILDFLAG(GOOGLE_TEST_SYNC_URL));
command_line->AppendSwitchASCII(switches::kOAuth2ClientID,
- GOOGLE_TEST_OAUTH_CLIENT_ID);
+ BUILDFLAG(GOOGLE_TEST_OAUTH_CLIENT_ID));
command_line->AppendSwitchASCII(switches::kOAuth2ClientSecret,
- GOOGLE_TEST_OAUTH_CLIENT_SECRET);
+ BUILDFLAG(GOOGLE_TEST_OAUTH_CLIENT_SECRET));
}
// Populate command line flag for the Tab Switcher experiment from the
« no previous file with comments | « ios/chrome/browser/BUILD.gn ('k') | ios/chrome/browser/ui/webui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698