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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/fullscreen_exit_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
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/framed_browser_window_unittest.mm ('k') | chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h
diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h
index b48fc8760a9184237e206f6dff11bca0fc3f1bfe..60b986d8b8a98ca622d5ac8637e4ab1ed7ebe0bf 100644
--- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h
@@ -4,7 +4,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h"
#include "googleurl/src/gurl.h"
@@ -34,10 +34,10 @@ class Browser;
// text views cannot conveniently be created in IB. The xib file contains
// a text field |exitLabelPlaceholder_| that's replaced by this text view
// |exitLabel_| in -awakeFromNib.
- scoped_nsobject<NSTextView> exitLabel_;
+ base::scoped_nsobject<NSTextView> exitLabel_;
- scoped_nsobject<NSTimer> hideTimer_;
- scoped_nsobject<NSAnimation> hideAnimation_;
+ base::scoped_nsobject<NSTimer> hideTimer_;
+ base::scoped_nsobject<NSAnimation> hideAnimation_;
};
// Initializes a new InfoBarController.
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/framed_browser_window_unittest.mm ('k') | chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698