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

Side by Side Diff: content/browser/gpu/gpu_internals_ui.cc

Issue 18161007: Replace angle_path gyp variable with regular path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@d3d11
Patch Set: rebase Created 7 years, 5 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/DEPS ('k') | content/content_gpu.gypi » ('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/browser/gpu/gpu_internals_ui.h" 5 #include "content/browser/gpu/gpu_internals_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 11 matching lines...) Expand all
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "content/public/browser/web_ui.h" 23 #include "content/public/browser/web_ui.h"
24 #include "content/public/browser/web_ui_data_source.h" 24 #include "content/public/browser/web_ui_data_source.h"
25 #include "content/public/browser/web_ui_message_handler.h" 25 #include "content/public/browser/web_ui_message_handler.h"
26 #include "content/public/common/content_client.h" 26 #include "content/public/common/content_client.h"
27 #include "content/public/common/content_switches.h" 27 #include "content/public/common/content_switches.h"
28 #include "content/public/common/url_constants.h" 28 #include "content/public/common/url_constants.h"
29 #include "gpu/config/gpu_feature_type.h" 29 #include "gpu/config/gpu_feature_type.h"
30 #include "gpu/config/gpu_info.h" 30 #include "gpu/config/gpu_info.h"
31 #include "grit/content_resources.h" 31 #include "grit/content_resources.h"
32
33
34 #if defined(ANGLE_DX11)
35 #include "third_party/angle_dx11/src/common/version.h" 32 #include "third_party/angle_dx11/src/common/version.h"
36 #else
37 #include "third_party/angle/src/common/version.h"
38 #endif
39 33
40 namespace content { 34 namespace content {
41 namespace { 35 namespace {
42 36
43 struct GpuFeatureInfo { 37 struct GpuFeatureInfo {
44 std::string name; 38 std::string name;
45 uint32 blocked; 39 uint32 blocked;
46 bool disabled; 40 bool disabled;
47 std::string disabled_description; 41 std::string disabled_description;
48 bool fallback_to_software; 42 bool fallback_to_software;
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 : WebUIController(web_ui) { 652 : WebUIController(web_ui) {
659 web_ui->AddMessageHandler(new GpuMessageHandler()); 653 web_ui->AddMessageHandler(new GpuMessageHandler());
660 654
661 // Set up the chrome://gpu/ source. 655 // Set up the chrome://gpu/ source.
662 BrowserContext* browser_context = 656 BrowserContext* browser_context =
663 web_ui->GetWebContents()->GetBrowserContext(); 657 web_ui->GetWebContents()->GetBrowserContext();
664 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); 658 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource());
665 } 659 }
666 660
667 } // namespace content 661 } // namespace content
OLDNEW
« no previous file with comments | « content/DEPS ('k') | content/content_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698