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

Side by Side Diff: webkit/plugins/npapi/webplugin_delegate_impl_mac.mm

Issue 13322003: Update the remaining references to sys_string_conversions.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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/plugins/npapi/webplugin_delegate_impl.h" 5 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 #import <QuartzCore/QuartzCore.h> 8 #import <QuartzCore/QuartzCore.h>
9 #include <unistd.h> 9 #include <unistd.h>
10 10
11 #include <set> 11 #include <set>
12 #include <string> 12 #include <string>
13 13
14 #include "base/mac/mac_util.h" 14 #include "base/mac/mac_util.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/metrics/stats_counters.h" 16 #include "base/metrics/stats_counters.h"
17 #include "base/string_util.h" 17 #include "base/string_util.h"
18 #include "base/sys_string_conversions.h" 18 #include "base/strings/sys_string_conversions.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #include "skia/ext/skia_utils_mac.h" 20 #include "skia/ext/skia_utils_mac.h"
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
22 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 22 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
23 #include "webkit/plugins/npapi/plugin_instance.h" 23 #include "webkit/plugins/npapi/plugin_instance.h"
24 #include "webkit/plugins/npapi/plugin_lib.h" 24 #include "webkit/plugins/npapi/plugin_lib.h"
25 #include "webkit/plugins/npapi/plugin_web_event_converter_mac.h" 25 #include "webkit/plugins/npapi/plugin_web_event_converter_mac.h"
26 #include "webkit/plugins/npapi/webplugin.h" 26 #include "webkit/plugins/npapi/webplugin.h"
27 #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h" 27 #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
28 28
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 [CATransaction commit]; 719 [CATransaction commit];
720 720
721 [renderer_ setBounds:[layer_ bounds]]; 721 [renderer_ setBounds:[layer_ bounds]];
722 surface_->SetSize(window_rect_.size()); 722 surface_->SetSize(window_rect_.size());
723 // Kick off the drawing timer, if necessary. 723 // Kick off the drawing timer, if necessary.
724 PluginVisibilityChanged(); 724 PluginVisibilityChanged();
725 } 725 }
726 726
727 } // namespace npapi 727 } // namespace npapi
728 } // namespace webkit 728 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698