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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 639233002: Remote assistance on Chrome OS Part IV - It2MeHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 2b9c6b9636a062d88e51554bbd59cd5f6185196e..12b1ee61e69fb8540eb14a0143f937a713406142 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -149,6 +149,7 @@
#include "chrome/browser/chromeos/system/input_device_settings.h"
#include "chromeos/chromeos_switches.h"
#include "components/user_manager/user_manager.h"
+#include "remoting/host/chromeos/chrome_browser_main_extra_parts_remoting.h"
#elif defined(OS_LINUX)
#include "chrome/browser/chrome_browser_main_linux.h"
#elif defined(OS_ANDROID)
@@ -701,6 +702,10 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
main_parts->AddParts(new ChromeBrowserMainExtraPartsX11());
#endif
+#if defined(OS_CHROMEOS)
+ main_parts->AddParts(new remoting::ChromeBrowserMainExtraPartsRemoting());
+#endif // defined(OS_CHROMEOS)
+
chrome::AddMetricsExtraParts(main_parts);
return main_parts;
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/extensions/api/DEPS » ('j') | remoting/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698