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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/chrome_to_mobile_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/chrome_event_processing_window_unittest.mm ('k') | chrome/browser/ui/cocoa/clickhold_button_cell.h » ('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/chrome_to_mobile_bubble_controller.h
diff --git a/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h b/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h
index a91db0dab5a56b7285350683edbe9398407e605d..74ca702805d489b18712b26d579cedc6082d826c 100644
--- a/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h
@@ -10,7 +10,7 @@
#include <vector>
#include "base/files/file_path.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chrome_to_mobile_service.h"
#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
@@ -97,7 +97,7 @@ class ChromeToMobileBubbleNotificationBridge
base::FilePath snapshotPath_;
// An animation used to cycle through the "Sending..." status messages.
- scoped_nsobject<NSAnimation> progressAnimation_;
+ base::scoped_nsobject<NSAnimation> progressAnimation_;
}
// The owner of this object is responsible for showing the bubble. It is not
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm ('k') | chrome/browser/ui/cocoa/clickhold_button_cell.h » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698