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

Unified Diff: chrome/chrome_browser_chromeos.gypi

Issue 1610813003: Merge arc/common/settings.mojom into intent_helper.mojom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 11 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
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_chromeos.gypi
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index dcf8fce29330483a309bad6852faf1e7b67dae9b..ea8101293653f49f52c80e1c1411376c5ac4329a 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -56,8 +56,8 @@
'browser/chromeos/arc/arc_auth_service.h',
'browser/chromeos/arc/arc_intent_helper_bridge.cc',
'browser/chromeos/arc/arc_intent_helper_bridge.h',
- 'browser/chromeos/arc/arc_settings_bridge.cc',
- 'browser/chromeos/arc/arc_settings_bridge.h',
+ 'browser/chromeos/arc/settings_bridge.cc',
+ 'browser/chromeos/arc/settings_bridge.h',
'browser/chromeos/attestation/attestation_ca_client.cc',
'browser/chromeos/attestation/attestation_ca_client.h',
'browser/chromeos/attestation/attestation_policy_observer.cc',
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698