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

Unified Diff: chrome/browser/ui/cocoa/website_settings_bubble_controller.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
Index: chrome/browser/ui/cocoa/website_settings_bubble_controller.h
diff --git a/chrome/browser/ui/cocoa/website_settings_bubble_controller.h b/chrome/browser/ui/cocoa/website_settings_bubble_controller.h
index 060496d054eb15b1b1431a392ab035d0ad1d759e..5f671e7d7bf9da3f4232771654f46175eda0a7b9 100644
--- a/chrome/browser/ui/cocoa/website_settings_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller.h
@@ -4,7 +4,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
#include "chrome/browser/ui/website_settings/website_settings_ui.h"
@@ -21,9 +21,9 @@ class WebContents;
@private
content::WebContents* webContents_;
- scoped_nsobject<NSView> contentView_;
- scoped_nsobject<NSSegmentedControl> segmentedControl_;
- scoped_nsobject<NSTabView> tabView_;
+ base::scoped_nsobject<NSView> contentView_;
+ base::scoped_nsobject<NSSegmentedControl> segmentedControl_;
+ base::scoped_nsobject<NSTabView> tabView_;
// Displays the web site identity.
NSTextField* identityField_;

Powered by Google App Engine
This is Rietveld 408576698