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

Unified Diff: chrome/browser/ui/cocoa/browser/zoom_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/browser/zoom_bubble_controller.h
diff --git a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.h b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.h
index 8b909db030a19a0be2bf3f6bc0b01bc07e2c10ef..c92468e208366f441eb50e8b33ccc191f92bfb47 100644
--- a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_UI_COCOA_BROWSER_ZOOM_BUBBLE_CONTROLLER_H_
#include "base/mac/scoped_block.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "chrome/browser/ui/cocoa/base_bubble_controller.h"
#import "ui/base/cocoa/tracking_area.h"
@@ -31,7 +31,7 @@ class WebContents;
base::mac::ScopedBlock<void(^)(ZoomBubbleController*)> closeObserver_;
// The text field that displays the current zoom percentage.
- scoped_nsobject<NSTextField> zoomPercent_;
+ base::scoped_nsobject<NSTextField> zoomPercent_;
// Whether or not the mouse is over the bubble.
BOOL isMouseInside_;

Powered by Google App Engine
This is Rietveld 408576698