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

Side by Side Diff: content/browser/renderer_host/text_input_client_mac.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 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 | 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/memory/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "base/synchronization/condition_variable.h" 11 #include "base/synchronization/condition_variable.h"
12 #include "base/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
13 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
14 #include "ui/gfx/point.h" 14 #include "ui/gfx/point.h"
15 15
16 template <typename T> struct DefaultSingletonTraits; 16 template <typename T> struct DefaultSingletonTraits;
17 17
18 namespace content { 18 namespace content {
19 class RenderWidgetHost; 19 class RenderWidgetHost;
20 20
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 // These methods lock the internal condition for use before the asynchronous 70 // These methods lock the internal condition for use before the asynchronous
71 // message is sent to the renderer to lookup the required information. These 71 // message is sent to the renderer to lookup the required information. These
72 // are only used on the UI thread. 72 // are only used on the UI thread.
73 void BeforeRequest(); 73 void BeforeRequest();
74 // Called at the end of a critical section. This will release the lock and 74 // Called at the end of a critical section. This will release the lock and
75 // condition. 75 // condition.
76 void AfterRequest(); 76 void AfterRequest();
77 77
78 NSUInteger character_index_; 78 NSUInteger character_index_;
79 NSRect first_rect_; 79 NSRect first_rect_;
80 scoped_nsobject<NSAttributedString> substring_; 80 base::scoped_nsobject<NSAttributedString> substring_;
81 81
82 base::Lock lock_; 82 base::Lock lock_;
83 base::ConditionVariable condition_; 83 base::ConditionVariable condition_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(TextInputClientMac); 85 DISALLOW_COPY_AND_ASSIGN(TextInputClientMac);
86 }; 86 };
87 87
88 } // namespace content 88 } // namespace content
89 89
90 #endif // CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ 90 #endif // CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698