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

Unified Diff: remoting/host/continue_window_mac.mm

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: remoting/host/continue_window_mac.mm
diff --git a/remoting/host/continue_window_mac.mm b/remoting/host/continue_window_mac.mm
index c8d3a8a059f608f69ef98bcdecb4e1fcef0e25cd..5ab2bdb1a469b21acf6c8bd3e226cede700e86f3 100644
--- a/remoting/host/continue_window_mac.mm
+++ b/remoting/host/continue_window_mac.mm
@@ -7,15 +7,15 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#include "remoting/host/continue_window.h"
// Handles the ContinueWindow.
@interface ContinueWindowMacController : NSObject {
@private
- scoped_nsobject<NSMutableArray> shades_;
- scoped_nsobject<NSAlert> continue_alert_;
+ base::scoped_nsobject<NSMutableArray> shades_;
+ base::scoped_nsobject<NSAlert> continue_alert_;
remoting::ContinueWindow* continue_window_;
const remoting::UiStrings* ui_strings_;
}
@@ -43,7 +43,7 @@ class ContinueWindowMac : public ContinueWindow {
virtual void HideUi() OVERRIDE;
private:
- scoped_nsobject<ContinueWindowMacController> controller_;
+ base::scoped_nsobject<ContinueWindowMacController> controller_;
DISALLOW_COPY_AND_ASSIGN(ContinueWindowMac);
};
@@ -136,7 +136,7 @@ scoped_ptr<HostWindow> HostWindow::CreateContinueWindow(
NSBundle *bundle = [NSBundle bundleForClass:[self class]];
NSString *imagePath = [bundle pathForResource:@"chromoting128" ofType:@"png"];
- scoped_nsobject<NSImage> image(
+ base::scoped_nsobject<NSImage> image(
[[NSImage alloc] initByReferencingFile:imagePath]);
[continue_alert_ setIcon:image];
[continue_alert_ layout];

Powered by Google App Engine
This is Rietveld 408576698