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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/gpu_process_host.h ('k') | chrome/browser/gpu_process_host_ui_shim.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/gpu_process_host.h" 5 #include "chrome/browser/gpu_process_host.h"
6 6
7 #include "app/app_switches.h" 7 #include "app/app_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/ref_counted.h" 10 #include "base/ref_counted.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/common/gpu_messages.h" 23 #include "chrome/common/gpu_messages.h"
24 #include "chrome/common/render_messages.h" 24 #include "chrome/common/render_messages.h"
25 #include "chrome/gpu/gpu_thread.h" 25 #include "chrome/gpu/gpu_thread.h"
26 #include "grit/browser_resources.h" 26 #include "grit/browser_resources.h"
27 #include "ipc/ipc_channel_handle.h" 27 #include "ipc/ipc_channel_handle.h"
28 #include "ipc/ipc_switches.h" 28 #include "ipc/ipc_switches.h"
29 #include "media/base/media_switches.h" 29 #include "media/base/media_switches.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 31
32 #if defined(OS_LINUX) 32 #if defined(OS_LINUX)
33 #include "gfx/gtk_native_view_id_manager.h" 33 #include "ui/gfx/gtk_native_view_id_manager.h"
34 #endif // defined(OS_LINUX) 34 #endif // defined(OS_LINUX)
35 35
36 namespace { 36 namespace {
37 37
38 enum GPUProcessLifetimeEvent { 38 enum GPUProcessLifetimeEvent {
39 LAUNCHED, 39 LAUNCHED,
40 DIED_FIRST_TIME, 40 DIED_FIRST_TIME,
41 DIED_SECOND_TIME, 41 DIED_SECOND_TIME,
42 DIED_THIRD_TIME, 42 DIED_THIRD_TIME,
43 DIED_FOURTH_TIME, 43 DIED_FOURTH_TIME,
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); 544 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
545 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) || 545 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) ||
546 blacklist->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true)) { 546 blacklist->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true)) {
547 gpu_blacklist_.reset(blacklist); 547 gpu_blacklist_.reset(blacklist);
548 return true; 548 return true;
549 } 549 }
550 delete blacklist; 550 delete blacklist;
551 return false; 551 return false;
552 } 552 }
553 553
OLDNEW
« no previous file with comments | « chrome/browser/gpu_process_host.h ('k') | chrome/browser/gpu_process_host_ui_shim.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698