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

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

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 12 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 #if defined(OS_LINUX) && defined(USE_X11) 7 #include <stddef.h>
8 #include <X11/Xlib.h>
9 #endif
10 8
11 #include <string> 9 #include <string>
12 10
13 #include "base/bind.h" 11 #include "base/bind.h"
14 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
15 #include "base/command_line.h" 13 #include "base/command_line.h"
16 #include "base/environment.h" 14 #include "base/environment.h"
17 #include "base/i18n/time_formatting.h" 15 #include "base/i18n/time_formatting.h"
16 #include "base/macros.h"
18 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
20 #include "base/sys_info.h" 19 #include "base/sys_info.h"
21 #include "base/values.h" 20 #include "base/values.h"
21 #include "build/build_config.h"
22 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" 22 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
23 #include "content/browser/gpu/compositor_util.h" 23 #include "content/browser/gpu/compositor_util.h"
24 #include "content/browser/gpu/gpu_data_manager_impl.h" 24 #include "content/browser/gpu/gpu_data_manager_impl.h"
25 #include "content/grit/content_resources.h" 25 #include "content/grit/content_resources.h"
26 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
27 #include "content/public/browser/gpu_data_manager_observer.h" 27 #include "content/public/browser/gpu_data_manager_observer.h"
28 #include "content/public/browser/web_contents.h" 28 #include "content/public/browser/web_contents.h"
29 #include "content/public/browser/web_ui.h" 29 #include "content/public/browser/web_ui.h"
30 #include "content/public/browser/web_ui_data_source.h" 30 #include "content/public/browser/web_ui_data_source.h"
31 #include "content/public/browser/web_ui_message_handler.h" 31 #include "content/public/browser/web_ui_message_handler.h"
32 #include "content/public/common/content_client.h" 32 #include "content/public/common/content_client.h"
33 #include "content/public/common/content_switches.h" 33 #include "content/public/common/content_switches.h"
34 #include "content/public/common/url_constants.h" 34 #include "content/public/common/url_constants.h"
35 #include "gpu/config/gpu_feature_type.h" 35 #include "gpu/config/gpu_feature_type.h"
36 #include "gpu/config/gpu_info.h" 36 #include "gpu/config/gpu_info.h"
37 #include "third_party/angle/src/common/version.h" 37 #include "third_party/angle/src/common/version.h"
38 #include "ui/gl/gpu_switching_manager.h" 38 #include "ui/gl/gpu_switching_manager.h"
39 39
40 #if defined(OS_LINUX) && defined(USE_X11)
41 #include <X11/Xlib.h>
42 #endif
40 #if defined(OS_WIN) 43 #if defined(OS_WIN)
41 #include "ui/base/win/shell.h" 44 #include "ui/base/win/shell.h"
42 #endif 45 #endif
43 46
44 #if defined(OS_LINUX) && defined(USE_X11) 47 #if defined(OS_LINUX) && defined(USE_X11)
45 #include "ui/base/x/x11_util.h" 48 #include "ui/base/x/x11_util.h"
46 #include "ui/gfx/x/x11_atom_cache.h" 49 #include "ui/gfx/x/x11_atom_cache.h"
47 #endif 50 #endif
48 51
49 namespace content { 52 namespace content {
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 : WebUIController(web_ui) { 523 : WebUIController(web_ui) {
521 web_ui->AddMessageHandler(new GpuMessageHandler()); 524 web_ui->AddMessageHandler(new GpuMessageHandler());
522 525
523 // Set up the chrome://gpu/ source. 526 // Set up the chrome://gpu/ source.
524 BrowserContext* browser_context = 527 BrowserContext* browser_context =
525 web_ui->GetWebContents()->GetBrowserContext(); 528 web_ui->GetWebContents()->GetBrowserContext();
526 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource()); 529 WebUIDataSource::Add(browser_context, CreateGpuHTMLSource());
527 } 530 }
528 531
529 } // namespace content 532 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_data_manager_impl_private_unittest.cc ('k') | content/browser/gpu/gpu_ipc_browsertests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698