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

Unified Diff: chrome/browser/ui/cocoa/infobars/translate_infobar_base.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/infobars/translate_infobar_base.h
diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.h b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.h
index 31df784705ce3af37664ef6bf6ca0eb8ed4ae1ce..d1d96ae6e699bbe8d363cc4d233e344b68b0d49e 100644
--- a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.h
+++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/translate/options_menu_model.h"
#include "chrome/browser/translate/translate_infobar_delegate.h"
@@ -23,17 +23,17 @@
// - (bool)verifyLayout; // For testing.
@interface TranslateInfoBarControllerBase : InfoBarController<NSMenuDelegate> {
@protected
- scoped_nsobject<NSTextField> label1_;
- scoped_nsobject<NSTextField> label2_;
- scoped_nsobject<NSTextField> label3_;
- scoped_nsobject<NSPopUpButton> fromLanguagePopUp_;
- scoped_nsobject<NSPopUpButton> toLanguagePopUp_;
- scoped_nsobject<NSPopUpButton> optionsPopUp_;
- scoped_nsobject<NSButton> showOriginalButton_;
+ base::scoped_nsobject<NSTextField> label1_;
+ base::scoped_nsobject<NSTextField> label2_;
+ base::scoped_nsobject<NSTextField> label3_;
+ base::scoped_nsobject<NSPopUpButton> fromLanguagePopUp_;
+ base::scoped_nsobject<NSPopUpButton> toLanguagePopUp_;
+ base::scoped_nsobject<NSPopUpButton> optionsPopUp_;
+ base::scoped_nsobject<NSButton> showOriginalButton_;
// This is the button used in the translate message infobar. It can either be
// a "Try Again" button, or a "Show Original" button in the case that the
// page was translated from an unknown language.
- scoped_nsobject<NSButton> translateMessageButton_;
+ base::scoped_nsobject<NSButton> translateMessageButton_;
// In the current locale, are the "from" and "to" language popup menu
// flipped from what they'd appear in English.

Powered by Google App Engine
This is Rietveld 408576698