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

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

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/google/google_update.cc ('k') | chrome/browser/gtk/dialogs_gtk.cc » ('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 "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/string_piece.h" 11 #include "base/string_piece.h"
12 #include "base/thread.h" 12 #include "base/threading/thread.h"
13 #include "chrome/browser/browser_thread.h" 13 #include "chrome/browser/browser_thread.h"
14 #include "chrome/browser/gpu_blacklist.h" 14 #include "chrome/browser/gpu_blacklist.h"
15 #include "chrome/browser/gpu_process_host_ui_shim.h" 15 #include "chrome/browser/gpu_process_host_ui_shim.h"
16 #include "chrome/browser/renderer_host/render_message_filter.h" 16 #include "chrome/browser/renderer_host/render_message_filter.h"
17 #include "chrome/browser/renderer_host/render_view_host.h" 17 #include "chrome/browser/renderer_host/render_view_host.h"
18 #include "chrome/browser/renderer_host/render_widget_host_view.h" 18 #include "chrome/browser/renderer_host/render_widget_host_view.h"
19 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" 19 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/gpu_feature_flags.h" 21 #include "chrome/common/gpu_feature_flags.h"
22 #include "chrome/common/gpu_info.h" 22 #include "chrome/common/gpu_info.h"
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); 564 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
565 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) || 565 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) ||
566 blacklist->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true)) { 566 blacklist->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true)) {
567 gpu_blacklist_.reset(blacklist); 567 gpu_blacklist_.reset(blacklist);
568 return true; 568 return true;
569 } 569 }
570 delete blacklist; 570 delete blacklist;
571 return false; 571 return false;
572 } 572 }
573 573
OLDNEW
« no previous file with comments | « chrome/browser/google/google_update.cc ('k') | chrome/browser/gtk/dialogs_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698