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

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

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Exclude certain files from jumbo because of a Windows problem Created 3 years, 3 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 "content/browser/gpu/gpu_internals_ui.h" 5 #include "content/browser/gpu/gpu_internals_ui.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 27 matching lines...) Expand all
38 #include "content/public/common/url_constants.h" 38 #include "content/public/common/url_constants.h"
39 #include "gpu/config/gpu_feature_type.h" 39 #include "gpu/config/gpu_feature_type.h"
40 #include "gpu/config/gpu_info.h" 40 #include "gpu/config/gpu_info.h"
41 #include "gpu/ipc/host/gpu_memory_buffer_support.h" 41 #include "gpu/ipc/host/gpu_memory_buffer_support.h"
42 #include "skia/ext/skia_commit_hash.h" 42 #include "skia/ext/skia_commit_hash.h"
43 #include "third_party/angle/src/common/version.h" 43 #include "third_party/angle/src/common/version.h"
44 #include "third_party/skia/include/core/SkMilestone.h" 44 #include "third_party/skia/include/core/SkMilestone.h"
45 #include "ui/gl/gpu_switching_manager.h" 45 #include "ui/gl/gpu_switching_manager.h"
46 46
47 #if defined(OS_LINUX) && defined(USE_X11) 47 #if defined(OS_LINUX) && defined(USE_X11)
48 #include <X11/Xlib.h> 48 #include "ui/base/x/x11_util_internal.h"
49 #endif 49 #endif
50 #if defined(OS_WIN) 50 #if defined(OS_WIN)
51 #include "ui/base/win/shell.h" 51 #include "ui/base/win/shell.h"
52 #include "ui/gfx/win/physical_size.h" 52 #include "ui/gfx/win/physical_size.h"
53 #endif 53 #endif
54 54
55 #if defined(OS_LINUX) && defined(USE_X11) 55 #if defined(OS_LINUX) && defined(USE_X11)
56 #include "ui/base/x/x11_util.h" // nogncheck 56 #include "ui/base/x/x11_util.h" // nogncheck
57 #include "ui/gfx/x/x11_atom_cache.h" // nogncheck 57 #include "ui/gfx/x/x11_atom_cache.h" // nogncheck
58 #endif 58 #endif
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 : WebUIController(web_ui) { 564 : WebUIController(web_ui) {
565 web_ui->AddMessageHandler(base::MakeUnique<GpuMessageHandler>()); 565 web_ui->AddMessageHandler(base::MakeUnique<GpuMessageHandler>());
566 566
567 // Set up the chrome://gpu/ source. 567 // Set up the chrome://gpu/ source.
568 BrowserContext* browser_context = 568 BrowserContext* browser_context =
569 web_ui->GetWebContents()->GetBrowserContext(); 569 web_ui->GetWebContents()->GetBrowserContext();
570 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); 570 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource());
571 } 571 }
572 572
573 } // namespace content 573 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.cc ('k') | content/browser/indexed_db/indexed_db_callbacks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698