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

Side by Side Diff: webkit/child/webkitplatformsupport_impl.cc

Issue 21952005: Reland: Remove webkit_chromium_resources.pak entries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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) 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 "webkit/child/webkitplatformsupport_impl.h" 5 #include "webkit/child/webkitplatformsupport_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/allocator/allocator_extension.h" 11 #include "base/allocator/allocator_extension.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/singleton.h" 15 #include "base/memory/singleton.h"
16 #include "base/message_loop/message_loop.h" 16 #include "base/message_loop/message_loop.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/metrics/sparse_histogram.h" 18 #include "base/metrics/sparse_histogram.h"
19 #include "base/metrics/stats_counters.h" 19 #include "base/metrics/stats_counters.h"
20 #include "base/platform_file.h" 20 #include "base/platform_file.h"
21 #include "base/process/process_metrics.h" 21 #include "base/process/process_metrics.h"
22 #include "base/rand_util.h" 22 #include "base/rand_util.h"
23 #include "base/strings/string_number_conversions.h" 23 #include "base/strings/string_number_conversions.h"
24 #include "base/strings/string_util.h" 24 #include "base/strings/string_util.h"
25 #include "base/strings/utf_string_conversions.h" 25 #include "base/strings/utf_string_conversions.h"
26 #include "base/synchronization/lock.h" 26 #include "base/synchronization/lock.h"
27 #include "base/time/time.h" 27 #include "base/time/time.h"
28 #include "content/public/common/webplugininfo.h" 28 #include "content/public/common/webplugininfo.h"
29 #include "grit/webkit_chromium_resources.h" 29 #include "grit/blink_resources.h"
30 #include "grit/webkit_resources.h" 30 #include "grit/webkit_resources.h"
31 #include "grit/webkit_strings.h" 31 #include "grit/webkit_strings.h"
32 #include "net/base/data_url.h" 32 #include "net/base/data_url.h"
33 #include "net/base/mime_util.h" 33 #include "net/base/mime_util.h"
34 #include "net/base/net_errors.h" 34 #include "net/base/net_errors.h"
35 #include "third_party/WebKit/public/platform/WebCookie.h" 35 #include "third_party/WebKit/public/platform/WebCookie.h"
36 #include "third_party/WebKit/public/platform/WebData.h" 36 #include "third_party/WebKit/public/platform/WebData.h"
37 #include "third_party/WebKit/public/platform/WebDiscardableMemory.h" 37 #include "third_party/WebKit/public/platform/WebDiscardableMemory.h"
38 #include "third_party/WebKit/public/platform/WebGestureCurve.h" 38 #include "third_party/WebKit/public/platform/WebGestureCurve.h"
39 #include "third_party/WebKit/public/platform/WebPluginListBuilder.h" 39 #include "third_party/WebKit/public/platform/WebPluginListBuilder.h"
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 if (--shared_timer_suspended_ == 0 && 871 if (--shared_timer_suspended_ == 0 &&
872 (!shared_timer_.IsRunning() || 872 (!shared_timer_.IsRunning() ||
873 shared_timer_fire_time_was_set_while_suspended_)) { 873 shared_timer_fire_time_was_set_while_suspended_)) {
874 shared_timer_fire_time_was_set_while_suspended_ = false; 874 shared_timer_fire_time_was_set_while_suspended_ = false;
875 setSharedTimerFireInterval( 875 setSharedTimerFireInterval(
876 shared_timer_fire_time_ - monotonicallyIncreasingTime()); 876 shared_timer_fire_time_ - monotonicallyIncreasingTime());
877 } 877 }
878 } 878 }
879 879
880 } // namespace webkit_glue 880 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698