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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 10351002: ui: Move surface/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix gpu DEPS Created 8 years, 7 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 "content/browser/renderer_host/render_widget_host_view_mac.h" 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
6 6
7 #include <QuartzCore/QuartzCore.h> 7 #include <QuartzCore/QuartzCore.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/mac/closure_blocks_leopard_compat.h"
12 #include "base/mac/mac_util.h" 13 #include "base/mac/mac_util.h"
13 #include "base/mac/closure_blocks_leopard_compat.h"
14 #include "base/mac/scoped_cftyperef.h" 14 #include "base/mac/scoped_cftyperef.h"
15 #import "base/mac/scoped_nsautorelease_pool.h" 15 #import "base/mac/scoped_nsautorelease_pool.h"
16 #import "base/memory/scoped_nsobject.h" 16 #import "base/memory/scoped_nsobject.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/string_util.h" 18 #include "base/string_util.h"
19 #include "base/sys_info.h" 19 #include "base/sys_info.h"
20 #include "base/sys_string_conversions.h" 20 #include "base/sys_string_conversions.h"
21 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
22 #import "content/browser/accessibility/browser_accessibility_cocoa.h" 22 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
23 #include "content/browser/accessibility/browser_accessibility_manager.h" 23 #include "content/browser/accessibility/browser_accessibility_manager.h"
(...skipping 18 matching lines...) Expand all
42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact ory.h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFact ory.h"
45 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact ory.h" 45 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFact ory.h"
46 #import "third_party/mozilla/ComplexTextInputPanel.h" 46 #import "third_party/mozilla/ComplexTextInputPanel.h"
47 #include "third_party/skia/include/core/SkColor.h" 47 #include "third_party/skia/include/core/SkColor.h"
48 #import "ui/base/cocoa/fullscreen_window_manager.h" 48 #import "ui/base/cocoa/fullscreen_window_manager.h"
49 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" 49 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
50 #include "ui/gfx/point.h" 50 #include "ui/gfx/point.h"
51 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 51 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
52 #include "ui/gfx/surface/io_surface_support_mac.h" 52 #include "ui/surface/io_surface_support_mac.h"
53 #include "webkit/glue/webaccessibility.h" 53 #include "webkit/glue/webaccessibility.h"
54 #include "webkit/plugins/npapi/webplugin.h" 54 #include "webkit/plugins/npapi/webplugin.h"
55 55
56 using content::BrowserThread; 56 using content::BrowserThread;
57 using content::RenderViewHostImpl; 57 using content::RenderViewHostImpl;
58 using content::RenderWidgetHost; 58 using content::RenderWidgetHost;
59 using content::RenderWidgetHostImpl; 59 using content::RenderWidgetHostImpl;
60 using content::RenderWidgetHostView; 60 using content::RenderWidgetHostView;
61 using WebKit::WebInputEvent; 61 using WebKit::WebInputEvent;
62 using WebKit::WebInputEventFactory; 62 using WebKit::WebInputEventFactory;
(...skipping 2834 matching lines...) Expand 10 before | Expand all | Expand 10 after
2897 if (!string) return NO; 2897 if (!string) return NO;
2898 2898
2899 // If the user is currently using an IME, confirm the IME input, 2899 // If the user is currently using an IME, confirm the IME input,
2900 // and then insert the text from the service, the same as TextEdit and Safari. 2900 // and then insert the text from the service, the same as TextEdit and Safari.
2901 [self confirmComposition]; 2901 [self confirmComposition];
2902 [self insertText:string]; 2902 [self insertText:string];
2903 return YES; 2903 return YES;
2904 } 2904 }
2905 2905
2906 @end 2906 @end
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_helper.h ('k') | content/browser/renderer_host/render_widget_host_view_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698