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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/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
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"
9 #include "base/command_line.h" 8 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
11 #include "base/string_piece.h" 10 #include "base/string_piece.h"
12 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
13 #include "chrome/browser/browser_thread.h" 12 #include "chrome/browser/browser_thread.h"
14 #include "chrome/browser/gpu_blacklist.h" 13 #include "chrome/browser/gpu_blacklist.h"
15 #include "chrome/browser/gpu_process_host_ui_shim.h" 14 #include "chrome/browser/gpu_process_host_ui_shim.h"
16 #include "chrome/browser/renderer_host/render_message_filter.h" 15 #include "chrome/browser/renderer_host/render_message_filter.h"
17 #include "chrome/browser/renderer_host/render_view_host.h" 16 #include "chrome/browser/renderer_host/render_view_host.h"
18 #include "chrome/browser/renderer_host/render_widget_host_view.h" 17 #include "chrome/browser/renderer_host/render_widget_host_view.h"
19 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" 18 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
20 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/gpu_feature_flags.h" 20 #include "chrome/common/gpu_feature_flags.h"
22 #include "chrome/common/gpu_info.h" 21 #include "chrome/common/gpu_info.h"
23 #include "chrome/common/gpu_messages.h" 22 #include "chrome/common/gpu_messages.h"
24 #include "chrome/common/render_messages.h" 23 #include "chrome/common/render_messages.h"
25 #include "chrome/gpu/gpu_thread.h" 24 #include "chrome/gpu/gpu_thread.h"
26 #include "grit/browser_resources.h" 25 #include "grit/browser_resources.h"
27 #include "ipc/ipc_channel_handle.h" 26 #include "ipc/ipc_channel_handle.h"
28 #include "ipc/ipc_switches.h" 27 #include "ipc/ipc_switches.h"
29 #include "media/base/media_switches.h" 28 #include "media/base/media_switches.h"
29 #include "ui/base/resource/resource_bundle.h"
30 30
31 #if defined(OS_LINUX) 31 #if defined(OS_LINUX)
32 // These two #includes need to come after render_messages.h. 32 // These two #includes need to come after render_messages.h.
33 #include <gdk/gdkwindow.h> // NOLINT 33 #include <gdk/gdkwindow.h> // NOLINT
34 #include <gdk/gdkx.h> // NOLINT 34 #include <gdk/gdkx.h> // NOLINT
35 #include "gfx/gtk_native_view_id_manager.h" 35 #include "gfx/gtk_native_view_id_manager.h"
36 #include "gfx/size.h" 36 #include "gfx/size.h"
37 #include "ui/base/x/x11_util.h" 37 #include "ui/base/x/x11_util.h"
38 #endif // defined(OS_LINUX) 38 #endif // defined(OS_LINUX)
39 39
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); 650 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
651 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) || 651 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) ||
652 blacklist->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true)) { 652 blacklist->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true)) {
653 gpu_blacklist_.reset(blacklist); 653 gpu_blacklist_.reset(blacklist);
654 return true; 654 return true;
655 } 655 }
656 delete blacklist; 656 delete blacklist;
657 return false; 657 return false;
658 } 658 }
659 659
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698