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

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 2654993004: Move GPU blacklist calculation to GPU proc (Closed)
Patch Set: fix win clang build 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
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/test/fake_compositor_dependencies.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 "content/shell/app/shell_main_delegate.h" 5 #include "content/shell/app/shell_main_delegate.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 15 matching lines...) Expand all
26 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h " 26 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h "
27 #include "content/shell/browser/shell_browser_main.h" 27 #include "content/shell/browser/shell_browser_main.h"
28 #include "content/shell/browser/shell_content_browser_client.h" 28 #include "content/shell/browser/shell_content_browser_client.h"
29 #include "content/shell/common/layout_test/layout_test_content_client.h" 29 #include "content/shell/common/layout_test/layout_test_content_client.h"
30 #include "content/shell/common/layout_test/layout_test_switches.h" 30 #include "content/shell/common/layout_test/layout_test_switches.h"
31 #include "content/shell/common/shell_content_client.h" 31 #include "content/shell/common/shell_content_client.h"
32 #include "content/shell/common/shell_switches.h" 32 #include "content/shell/common/shell_switches.h"
33 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client .h" 33 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client .h"
34 #include "content/shell/renderer/shell_content_renderer_client.h" 34 #include "content/shell/renderer/shell_content_renderer_client.h"
35 #include "content/shell/utility/shell_content_utility_client.h" 35 #include "content/shell/utility/shell_content_utility_client.h"
36 #include "gpu/config/gpu_switches.h"
36 #include "media/base/media_switches.h" 37 #include "media/base/media_switches.h"
37 #include "media/base/mime_util.h" 38 #include "media/base/mime_util.h"
38 #include "net/cookies/cookie_monster.h" 39 #include "net/cookies/cookie_monster.h"
39 #include "ppapi/features/features.h" 40 #include "ppapi/features/features.h"
40 #include "ui/base/resource/resource_bundle.h" 41 #include "ui/base/resource/resource_bundle.h"
41 #include "ui/base/ui_base_paths.h" 42 #include "ui/base/ui_base_paths.h"
42 #include "ui/base/ui_base_switches.h" 43 #include "ui/base/ui_base_switches.h"
43 #include "ui/display/display_switches.h" 44 #include "ui/display/display_switches.h"
44 #include "ui/gl/gl_switches.h" 45 #include "ui/gl/gl_switches.h"
45 46
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 368
368 return renderer_client_.get(); 369 return renderer_client_.get();
369 } 370 }
370 371
371 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { 372 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
372 utility_client_.reset(new ShellContentUtilityClient); 373 utility_client_.reset(new ShellContentUtilityClient);
373 return utility_client_.get(); 374 return utility_client_.get();
374 } 375 }
375 376
376 } // namespace content 377 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/test/fake_compositor_dependencies.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698