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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 142 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
143 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" 143 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
144 #include "chrome/browser/chromeos/file_manager/app_id.h" 144 #include "chrome/browser/chromeos/file_manager/app_id.h"
145 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" 145 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h"
146 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" 146 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
147 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" 147 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
148 #include "chrome/browser/chromeos/login/startup_utils.h" 148 #include "chrome/browser/chromeos/login/startup_utils.h"
149 #include "chrome/browser/chromeos/system/input_device_settings.h" 149 #include "chrome/browser/chromeos/system/input_device_settings.h"
150 #include "chromeos/chromeos_switches.h" 150 #include "chromeos/chromeos_switches.h"
151 #include "components/user_manager/user_manager.h" 151 #include "components/user_manager/user_manager.h"
152 #include "remoting/host/chromeos/chrome_browser_main_extra_parts_remoting.h"
152 #elif defined(OS_LINUX) 153 #elif defined(OS_LINUX)
153 #include "chrome/browser/chrome_browser_main_linux.h" 154 #include "chrome/browser/chrome_browser_main_linux.h"
154 #elif defined(OS_ANDROID) 155 #elif defined(OS_ANDROID)
155 #include "chrome/browser/android/new_tab_page_url_handler.h" 156 #include "chrome/browser/android/new_tab_page_url_handler.h"
156 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" 157 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
157 #include "chrome/browser/chrome_browser_main_android.h" 158 #include "chrome/browser/chrome_browser_main_android.h"
158 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 159 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
159 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h" 160 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
160 #include "chrome/common/descriptors_android.h" 161 #include "chrome/common/descriptors_android.h"
161 #include "components/crash/browser/crash_dump_manager_android.h" 162 #include "components/crash/browser/crash_dump_manager_android.h"
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 #endif 695 #endif
695 696
696 #if defined(USE_AURA) 697 #if defined(USE_AURA)
697 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); 698 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
698 #endif 699 #endif
699 700
700 #if defined(USE_X11) 701 #if defined(USE_X11)
701 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); 702 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11());
702 #endif 703 #endif
703 704
705 #if defined(OS_CHROMEOS)
706 main_parts->AddParts(new remoting::ChromeBrowserMainExtraPartsRemoting());
707 #endif // defined(OS_CHROMEOS)
708
704 chrome::AddMetricsExtraParts(main_parts); 709 chrome::AddMetricsExtraParts(main_parts);
705 710
706 return main_parts; 711 return main_parts;
707 } 712 }
708 713
709 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite( 714 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite(
710 content::BrowserContext* browser_context, 715 content::BrowserContext* browser_context,
711 const GURL& site) { 716 const GURL& site) {
712 std::string partition_id; 717 std::string partition_id;
713 718
(...skipping 1919 matching lines...) Expand 10 before | Expand all | Expand 10 after
2633 switches::kDisableWebRtcEncryption, 2638 switches::kDisableWebRtcEncryption,
2634 }; 2639 };
2635 to_command_line->CopySwitchesFrom(from_command_line, 2640 to_command_line->CopySwitchesFrom(from_command_line,
2636 kWebRtcDevSwitchNames, 2641 kWebRtcDevSwitchNames,
2637 arraysize(kWebRtcDevSwitchNames)); 2642 arraysize(kWebRtcDevSwitchNames));
2638 } 2643 }
2639 } 2644 }
2640 #endif // defined(ENABLE_WEBRTC) 2645 #endif // defined(ENABLE_WEBRTC)
2641 2646
2642 } // namespace chrome 2647 } // namespace chrome
OLDNEW
« 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