content/browser/gpu/gpu_data_manager_impl_private.cc - Issue 147373005: Move webkit/common/webpreferences to content/public/common/

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

Issue 147373005: Move webkit/common/webpreferences to content/public/common/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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 | « content/browser/android/content_settings.cc ('k') | content/browser/renderer_host/render_view_host_delegate.cc » ('j') | content/public/common/webpreferences.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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_data_manager_impl_private.h"	5 #include "content/browser/gpu/gpu_data_manager_impl_private.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/debug/trace_event.h"	10 #include "base/debug/trace_event.h"

11 #include "base/metrics/field_trial.h"	11 #include "base/metrics/field_trial.h"

12 #include "base/metrics/histogram.h"	12 #include "base/metrics/histogram.h"

13 #include "base/metrics/sparse_histogram.h"	13 #include "base/metrics/sparse_histogram.h"

14 #include "base/strings/string_number_conversions.h"	14 #include "base/strings/string_number_conversions.h"

15 #include "base/strings/stringprintf.h"	15 #include "base/strings/stringprintf.h"

16 #include "base/sys_info.h"	16 #include "base/sys_info.h"

17 #include "base/version.h"	17 #include "base/version.h"

18 #include "cc/base/switches.h"	18 #include "cc/base/switches.h"

19 #include "content/browser/gpu/gpu_process_host.h"	19 #include "content/browser/gpu/gpu_process_host.h"

20 #include "content/common/gpu/gpu_messages.h"	20 #include "content/common/gpu/gpu_messages.h"

21 #include "content/public/browser/browser_thread.h"	21 #include "content/public/browser/browser_thread.h"

22 #include "content/public/browser/gpu_data_manager_observer.h"	22 #include "content/public/browser/gpu_data_manager_observer.h"

23 #include "content/public/common/content_client.h"	23 #include "content/public/common/content_client.h"

24 #include "content/public/common/content_constants.h"	24 #include "content/public/common/content_constants.h"

25 #include "content/public/common/content_switches.h"	25 #include "content/public/common/content_switches.h"

	26 #include "content/public/common/webpreferences.h"

26 #include "gpu/command_buffer/service/gpu_switches.h"	27 #include "gpu/command_buffer/service/gpu_switches.h"

27 #include "gpu/config/gpu_control_list_jsons.h"	28 #include "gpu/config/gpu_control_list_jsons.h"

28 #include "gpu/config/gpu_driver_bug_workaround_type.h"	29 #include "gpu/config/gpu_driver_bug_workaround_type.h"

29 #include "gpu/config/gpu_feature_type.h"	30 #include "gpu/config/gpu_feature_type.h"

30 #include "gpu/config/gpu_info_collector.h"	31 #include "gpu/config/gpu_info_collector.h"

31 #include "gpu/config/gpu_util.h"	32 #include "gpu/config/gpu_util.h"

32 #include "ui/base/ui_base_switches.h"	33 #include "ui/base/ui_base_switches.h"

33 #include "ui/gl/gl_implementation.h"	34 #include "ui/gl/gl_implementation.h"

34 #include "ui/gl/gl_switches.h"	35 #include "ui/gl/gl_switches.h"

35 #include "ui/gl/gpu_switching_manager.h"	36 #include "ui/gl/gpu_switching_manager.h"

36 #include "webkit/common/webpreferences.h"

37	37

38 #if defined(OS_MACOSX)	38 #if defined(OS_MACOSX)

39 #include <ApplicationServices/ApplicationServices.h>	39 #include <ApplicationServices/ApplicationServices.h>

40 #endif // OS_MACOSX	40 #endif // OS_MACOSX

41 #if defined(OS_WIN)	41 #if defined(OS_WIN)

42 #include "base/win/windows_version.h"	42 #include "base/win/windows_version.h"

43 #endif // OS_WIN	43 #endif // OS_WIN

44 #if defined(OS_ANDROID)	44 #if defined(OS_ANDROID)

45 #include "ui/gfx/android/device_display_info.h"	45 #include "ui/gfx/android/device_display_info.h"

46 #endif // OS_ANDROID	46 #endif // OS_ANDROID

(...skipping 1123 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1170	1170

1171 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() {	1171 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() {

1172 gpu_process_accessible_ = false;	1172 gpu_process_accessible_ = false;

1173 gpu_info_.finalized = true;	1173 gpu_info_.finalized = true;

1174 complete_gpu_info_already_requested_ = true;	1174 complete_gpu_info_already_requested_ = true;

1175 // Some observers might be waiting.	1175 // Some observers might be waiting.

1176 NotifyGpuInfoUpdate();	1176 NotifyGpuInfoUpdate();

1177 }	1177 }

1178	1178

1179 } // namespace content	1179 } // namespace content

OLD	NEW