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

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

Issue 231733005: Delete the GTK+ port of Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remerge to ToT Created 6 years, 8 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 | Annotate | Revision Log
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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 #endif 215 #endif
216 216
217 #if defined(ENABLE_INPUT_SPEECH) 217 #if defined(ENABLE_INPUT_SPEECH)
218 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubbl e_ui.h" 218 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubbl e_ui.h"
219 #endif 219 #endif
220 220
221 #if defined(OS_CHROMEOS) 221 #if defined(OS_CHROMEOS)
222 #include "chrome/browser/chromeos/file_manager/app_id.h" 222 #include "chrome/browser/chromeos/file_manager/app_id.h"
223 #endif 223 #endif
224 224
225 #if defined(TOOLKIT_GTK)
226 #include "chrome/browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h"
227 #endif
228
229 #if defined(TOOLKIT_VIEWS) 225 #if defined(TOOLKIT_VIEWS)
230 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 226 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
231 #endif 227 #endif
232 228
233 #if defined(USE_ASH) 229 #if defined(USE_ASH)
234 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" 230 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
235 #endif 231 #endif
236 232
237 #if defined(USE_AURA) 233 #if defined(USE_AURA)
238 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h" 234 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h"
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 main_parts = new ChromeBrowserMainPartsPosix(parameters); 699 main_parts = new ChromeBrowserMainPartsPosix(parameters);
704 #else 700 #else
705 NOTREACHED(); 701 NOTREACHED();
706 main_parts = new ChromeBrowserMainParts(parameters); 702 main_parts = new ChromeBrowserMainParts(parameters);
707 #endif 703 #endif
708 704
709 chrome::AddProfilesExtraParts(main_parts); 705 chrome::AddProfilesExtraParts(main_parts);
710 706
711 // Construct additional browser parts. Stages are called in the order in 707 // Construct additional browser parts. Stages are called in the order in
712 // which they are added. 708 // which they are added.
713 #if defined(TOOLKIT_GTK)
714 main_parts->AddParts(new ChromeBrowserMainExtraPartsGtk());
715 #endif
716
717 #if defined(TOOLKIT_VIEWS) 709 #if defined(TOOLKIT_VIEWS)
718 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); 710 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
719 #endif 711 #endif
720 712
721 #if defined(USE_ASH) 713 #if defined(USE_ASH)
722 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); 714 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
723 #endif 715 #endif
724 716
725 #if defined(USE_AURA) 717 #if defined(USE_AURA)
726 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); 718 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
(...skipping 2030 matching lines...) Expand 10 before | Expand all | Expand 10 after
2757 switches::kDisableWebRtcEncryption, 2749 switches::kDisableWebRtcEncryption,
2758 }; 2750 };
2759 to_command_line->CopySwitchesFrom(from_command_line, 2751 to_command_line->CopySwitchesFrom(from_command_line,
2760 kWebRtcDevSwitchNames, 2752 kWebRtcDevSwitchNames,
2761 arraysize(kWebRtcDevSwitchNames)); 2753 arraysize(kWebRtcDevSwitchNames));
2762 } 2754 }
2763 } 2755 }
2764 #endif // defined(ENABLE_WEBRTC) 2756 #endif // defined(ENABLE_WEBRTC)
2765 2757
2766 } // namespace chrome 2758 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698