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

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

Issue 2878037: [Mac]Implement ViewID support. (third approach) (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Update according to review feedback. Created 10 years, 5 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
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 <QuartzCore/QuartzCore.h> 5 #include <QuartzCore/QuartzCore.h>
6 6
7 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" 7 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
8 8
9 #include "app/surface/io_surface_support_mac.h" 9 #include "app/surface/io_surface_support_mac.h"
10 #import "base/chrome_application_mac.h" 10 #import "base/chrome_application_mac.h"
11 #include "base/histogram.h" 11 #include "base/histogram.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #import "base/scoped_nsobject.h" 13 #import "base/scoped_nsobject.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/sys_string_conversions.h" 15 #include "base/sys_string_conversions.h"
16 #include "chrome/browser/browser_trial.h" 16 #include "chrome/browser/browser_trial.h"
17 #import "chrome/browser/cocoa/rwhvm_editcommand_helper.h" 17 #import "chrome/browser/cocoa/rwhvm_editcommand_helper.h"
18 #import "chrome/browser/cocoa/view_id_util.h"
18 #include "chrome/browser/plugin_process_host.h" 19 #include "chrome/browser/plugin_process_host.h"
19 #include "chrome/browser/renderer_host/backing_store_mac.h" 20 #include "chrome/browser/renderer_host/backing_store_mac.h"
20 #include "chrome/browser/renderer_host/render_process_host.h" 21 #include "chrome/browser/renderer_host/render_process_host.h"
21 #include "chrome/browser/renderer_host/render_view_host.h" 22 #include "chrome/browser/renderer_host/render_view_host.h"
22 #include "chrome/browser/renderer_host/render_widget_host.h" 23 #include "chrome/browser/renderer_host/render_widget_host.h"
23 #include "chrome/browser/spellchecker_platform_engine.h" 24 #include "chrome/browser/spellchecker_platform_engine.h"
24 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/native_web_keyboard_event.h" 26 #include "chrome/common/native_web_keyboard_event.h"
26 #include "chrome/common/edit_command.h" 27 #include "chrome/common/edit_command.h"
27 #include "chrome/common/plugin_messages.h" 28 #include "chrome/common/plugin_messages.h"
(...skipping 2062 matching lines...) Expand 10 before | Expand all | Expand 10 after
2090 - (void)confirmComposition { 2091 - (void)confirmComposition {
2091 if (!hasMarkedText_) 2092 if (!hasMarkedText_)
2092 return; 2093 return;
2093 2094
2094 if (renderWidgetHostView_->render_widget_host_) 2095 if (renderWidgetHostView_->render_widget_host_)
2095 renderWidgetHostView_->render_widget_host_->ImeConfirmComposition(); 2096 renderWidgetHostView_->render_widget_host_->ImeConfirmComposition();
2096 2097
2097 [self cancelComposition]; 2098 [self cancelComposition];
2098 } 2099 }
2099 2100
2101 - (ViewID)viewID {
2102 return VIEW_ID_TAB_CONTAINER_FOCUS_VIEW;
2103 }
2104
2100 @end 2105 @end
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/view_id_util_browsertest.mm ('k') | chrome/browser/tab_contents/tab_contents_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698