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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1680033004: Move gtk-specific browser main parts stuff to its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix ToolkitInitialized() Created 4 years, 10 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
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 #if defined(OS_ANDROID) 215 #if defined(OS_ANDROID)
216 #include "ui/base/ui_base_paths.h" 216 #include "ui/base/ui_base_paths.h"
217 #include "ui/gfx/android/device_display_info.h" 217 #include "ui/gfx/android/device_display_info.h"
218 #endif 218 #endif
219 219
220 #if defined(TOOLKIT_VIEWS) 220 #if defined(TOOLKIT_VIEWS)
221 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 221 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
222 #endif 222 #endif
223 223
224 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
225 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
226 #endif
227
224 #if defined(USE_ASH) 228 #if defined(USE_ASH)
225 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" 229 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
226 #endif 230 #endif
227 231
228 #if defined(USE_AURA)
229 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h"
230 #endif
231
232 #if defined(USE_X11) 232 #if defined(USE_X11)
233 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" 233 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h"
234 #endif 234 #endif
235 235
236 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 236 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
237 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 237 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
238 #endif 238 #endif
239 239
240 #if !defined(DISABLE_NACL) 240 #if !defined(DISABLE_NACL)
241 #include "components/nacl/browser/nacl_browser.h" 241 #include "components/nacl/browser/nacl_browser.h"
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 #else 773 #else
774 NOTREACHED(); 774 NOTREACHED();
775 main_parts = new ChromeBrowserMainParts(parameters); 775 main_parts = new ChromeBrowserMainParts(parameters);
776 #endif 776 #endif
777 777
778 chrome::AddProfilesExtraParts(main_parts); 778 chrome::AddProfilesExtraParts(main_parts);
779 779
780 // Construct additional browser parts. Stages are called in the order in 780 // Construct additional browser parts. Stages are called in the order in
781 // which they are added. 781 // which they are added.
782 #if defined(TOOLKIT_VIEWS) 782 #if defined(TOOLKIT_VIEWS)
783 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
784 main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
785 #else
783 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); 786 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
784 #endif 787 #endif
788 #endif
785 789
786 // TODO(oshima): Athena on chrome currently requires USE_ASH to build. 790 // TODO(oshima): Athena on chrome currently requires USE_ASH to build.
787 // We should reduce the dependency as much as possible. 791 // We should reduce the dependency as much as possible.
788 #if defined(USE_ASH) 792 #if defined(USE_ASH)
789 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); 793 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
790 #endif 794 #endif
791 795
792 #if defined(USE_AURA)
793 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
794 #endif
795
796 #if defined(USE_X11) 796 #if defined(USE_X11)
797 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); 797 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11());
798 #endif 798 #endif
799 799
800 #if defined(ENABLE_WAYLAND_SERVER) 800 #if defined(ENABLE_WAYLAND_SERVER)
801 main_parts->AddParts(new ChromeBrowserMainExtraPartsExo()); 801 main_parts->AddParts(new ChromeBrowserMainExtraPartsExo());
802 #endif 802 #endif
803 803
804 chrome::AddMetricsExtraParts(main_parts); 804 chrome::AddMetricsExtraParts(main_parts);
805 805
(...skipping 2094 matching lines...) Expand 10 before | Expand all | Expand 10 after
2900 if (channel <= kMaxDisableEncryptionChannel) { 2900 if (channel <= kMaxDisableEncryptionChannel) {
2901 static const char* const kWebRtcDevSwitchNames[] = { 2901 static const char* const kWebRtcDevSwitchNames[] = {
2902 switches::kDisableWebRtcEncryption, 2902 switches::kDisableWebRtcEncryption,
2903 }; 2903 };
2904 to_command_line->CopySwitchesFrom(from_command_line, 2904 to_command_line->CopySwitchesFrom(from_command_line,
2905 kWebRtcDevSwitchNames, 2905 kWebRtcDevSwitchNames,
2906 arraysize(kWebRtcDevSwitchNames)); 2906 arraysize(kWebRtcDevSwitchNames));
2907 } 2907 }
2908 } 2908 }
2909 #endif // defined(ENABLE_WEBRTC) 2909 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698