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

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

Issue 2652033003: Change ImmersiveContextMus to use DesktopCaptureClient. (Closed)
Patch Set: doc and auto Created 3 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
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 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 #endif 926 #endif
927 927
928 chrome::AddProfilesExtraParts(main_parts); 928 chrome::AddProfilesExtraParts(main_parts);
929 929
930 // Construct additional browser parts. Stages are called in the order in 930 // Construct additional browser parts. Stages are called in the order in
931 // which they are added. 931 // which they are added.
932 #if defined(TOOLKIT_VIEWS) 932 #if defined(TOOLKIT_VIEWS)
933 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) 933 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
934 main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); 934 main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
935 #else 935 #else
936 ChromeBrowserMainExtraPartsViews* extra_parts_views = 936 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
937 new ChromeBrowserMainExtraPartsViews;
938 main_parts->AddParts(extra_parts_views);
939 #if defined(USE_ASH) 937 #if defined(USE_ASH)
940 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh(extra_parts_views)); 938 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
941 #endif 939 #endif
942 #endif 940 #endif
943 #endif 941 #endif
944 942
945 #if defined(USE_X11) 943 #if defined(USE_X11)
946 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); 944 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11());
947 #endif 945 #endif
948 946
949 #if defined(ENABLE_WAYLAND_SERVER) 947 #if defined(ENABLE_WAYLAND_SERVER)
950 main_parts->AddParts(new ChromeBrowserMainExtraPartsExo()); 948 main_parts->AddParts(new ChromeBrowserMainExtraPartsExo());
(...skipping 2452 matching lines...) Expand 10 before | Expand all | Expand 10 after
3403 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { 3401 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() {
3404 return variations::GetVariationParamValue( 3402 return variations::GetVariationParamValue(
3405 "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true"; 3403 "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true";
3406 } 3404 }
3407 3405
3408 bool ChromeContentBrowserClient:: 3406 bool ChromeContentBrowserClient::
3409 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3407 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3410 return variations::GetVariationParamValue( 3408 return variations::GetVariationParamValue(
3411 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3409 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3412 } 3410 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698