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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.h

Issue 1466143002: arc-bridge: Enable ARC with a command-line flag (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Rebased to ToT Created 5 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 | « build/config/features.gni ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.h
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
index 10b3a3b7e8df01971f84a6a0e269fd70d752eb5d..0b546411c6fa438dd9a006fbae8dd1c3085c4182 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -15,11 +15,9 @@ namespace session_manager {
class SessionManager;
}
-#if defined(ENABLE_ARC)
namespace arc {
class ArcBridgeService;
}
-#endif
namespace chromeos {
@@ -83,9 +81,7 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
scoped_refptr<chromeos::ExternalMetrics> external_metrics_;
-#if defined(ENABLE_ARC)
scoped_ptr<arc::ArcBridgeService> arc_bridge_service_;
-#endif
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
};
« no previous file with comments | « build/config/features.gni ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698