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

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

Issue 9600036: Move Render(View|Widget)Host and associated classes to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to review comments. Created 8 years, 9 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 #import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegat e.h" 5 #import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegat e.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/mac/closure_blocks_leopard_compat.h" 9 #include "base/mac/closure_blocks_leopard_compat.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
11 #include "chrome/browser/debugger/devtools_window.h" 11 #include "chrome/browser/debugger/devtools_window.h"
12 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h" 12 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_list.h" 14 #include "chrome/browser/ui/browser_list.h"
15 #import "chrome/browser/ui/cocoa/history_overlay_controller.h" 15 #import "chrome/browser/ui/cocoa/history_overlay_controller.h"
16 #import "chrome/browser/ui/cocoa/view_id_util.h" 16 #import "chrome/browser/ui/cocoa/view_id_util.h"
17 #include "chrome/common/spellcheck_messages.h" 17 #include "chrome/common/spellcheck_messages.h"
18 #include "chrome/common/url_constants.h" 18 #include "chrome/common/url_constants.h"
19 #include "content/public/browser/render_view_host.h" 19 #include "content/public/browser/render_view_host.h"
20 #include "content/public/browser/render_view_host_observer.h" 20 #include "content/public/browser/render_view_host_observer.h"
21 #include "content/public/browser/render_widget_host.h" 21 #include "content/public/browser/render_widget_host.h"
22 #include "content/public/browser/render_widget_host_view.h" 22 #include "content/public/browser/render_widget_host_view.h"
23 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
24 24
25 using content::RenderViewHost;
26
25 // Declare things that are part of the 10.7 SDK. 27 // Declare things that are part of the 10.7 SDK.
26 #if !defined(MAC_OS_X_VERSION_10_7) || \ 28 #if !defined(MAC_OS_X_VERSION_10_7) || \
27 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 29 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
28 enum { 30 enum {
29 NSEventPhaseNone = 0, // event not associated with a phase. 31 NSEventPhaseNone = 0, // event not associated with a phase.
30 NSEventPhaseBegan = 0x1 << 0, 32 NSEventPhaseBegan = 0x1 << 0,
31 NSEventPhaseStationary = 0x1 << 1, 33 NSEventPhaseStationary = 0x1 << 1,
32 NSEventPhaseChanged = 0x1 << 2, 34 NSEventPhaseChanged = 0x1 << 2,
33 NSEventPhaseEnded = 0x1 << 3, 35 NSEventPhaseEnded = 0x1 << 3,
34 NSEventPhaseCancelled = 0x1 << 4, 36 NSEventPhaseCancelled = 0x1 << 4,
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 [view_delegate_ spellCheckEnabled:enabled checked:checked]; 103 [view_delegate_ spellCheckEnabled:enabled checked:checked];
102 } 104 }
103 105
104 ChromeRenderWidgetHostViewMacDelegate* view_delegate_; 106 ChromeRenderWidgetHostViewMacDelegate* view_delegate_;
105 }; 107 };
106 108
107 } // namespace ChromeRenderWidgetHostViewMacDelegateInternal 109 } // namespace ChromeRenderWidgetHostViewMacDelegateInternal
108 110
109 @implementation ChromeRenderWidgetHostViewMacDelegate 111 @implementation ChromeRenderWidgetHostViewMacDelegate
110 112
111 - (id)initWithRenderWidgetHost:(RenderWidgetHost*)renderWidgetHost { 113 - (id)initWithRenderWidgetHost:(content::RenderWidgetHost*)renderWidgetHost {
112 self = [super init]; 114 self = [super init];
113 if (self) { 115 if (self) {
114 renderWidgetHost_ = renderWidgetHost; 116 renderWidgetHost_ = renderWidgetHost;
115 NSView* nativeView = renderWidgetHost_->GetView()->GetNativeView(); 117 NSView* nativeView = renderWidgetHost_->GetView()->GetNativeView();
116 view_id_util::SetID(nativeView, VIEW_ID_TAB_CONTAINER_FOCUS_VIEW); 118 view_id_util::SetID(nativeView, VIEW_ID_TAB_CONTAINER_FOCUS_VIEW);
117 119
118 if (renderWidgetHost_->IsRenderView()) { 120 if (renderWidgetHost_->IsRenderView()) {
119 spellingObserver_.reset( 121 spellingObserver_.reset(
120 new ChromeRenderWidgetHostViewMacDelegateInternal:: 122 new ChromeRenderWidgetHostViewMacDelegateInternal::
121 SpellCheckRenderViewObserver( 123 SpellCheckRenderViewObserver(
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 } 361 }
360 362
361 - (void)spellCheckEnabled:(BOOL)enabled checked:(BOOL)checked { 363 - (void)spellCheckEnabled:(BOOL)enabled checked:(BOOL)checked {
362 spellcheckEnabled_ = enabled; 364 spellcheckEnabled_ = enabled;
363 spellcheckChecked_ = checked; 365 spellcheckChecked_ = checked;
364 } 366 }
365 367
366 // END Spellchecking methods 368 // END Spellchecking methods
367 369
368 @end 370 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698