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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/cocoa/base_view.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, 6 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 side-by-side diff with in-line comments
Download patch
« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/base/clipboard/clipboard_mac.mm ('k') | ui/base/cocoa/base_view_unittest.mm » ('j') | ui/base/cocoa/menu_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/base_view.h
diff --git a/ui/base/cocoa/base_view.h b/ui/base/cocoa/base_view.h
index f9bc275df3e86abf34c01745e642413d9b2692f6..df634fc52d2b67d6d449e03d2f0a55c6c53252d4 100644
--- a/ui/base/cocoa/base_view.h
+++ b/ui/base/cocoa/base_view.h
@@ -7,9 +7,9 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
-#include "ui/base/ui_export.h"
+#include "base/mac/scoped_nsobject.h"
#import "ui/base/cocoa/tracking_area.h"
+#include "ui/base/ui_export.h"
#include "ui/gfx/rect.h"
// A view that provides common functionality that many views will need:
@@ -21,7 +21,7 @@ UI_EXPORT
@private
ui::ScopedCrTrackingArea trackingArea_;
BOOL dragging_;
- scoped_nsobject<NSEvent> pendingExitEvent_;
+ base::scoped_nsobject<NSEvent> pendingExitEvent_;
}
// Override these methods in a subclass.
« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/base/clipboard/clipboard_mac.mm ('k') | ui/base/cocoa/base_view_unittest.mm » ('j') | ui/base/cocoa/menu_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698