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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/location_bar/plus_decoration.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/location_bar/autocomplete_text_field_cell.mm ('K') | « chrome/browser/ui/cocoa/location_bar/page_action_decoration.h ('k') | chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h » ('j') | content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/location_bar/plus_decoration.h
diff --git a/chrome/browser/ui/cocoa/location_bar/plus_decoration.h b/chrome/browser/ui/cocoa/location_bar/plus_decoration.h
index e318c70f29c5ae372af8732d19303f8349c8933c..64bcf70846f299875cb56b148aecf83246b1d8c6 100644
--- a/chrome/browser/ui/cocoa/location_bar/plus_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/plus_decoration.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "chrome/browser/ui/cocoa/location_bar/button_decoration.h"
#include "chrome/browser/ui/toolbar/action_box_button_controller.h"
@@ -54,7 +54,7 @@ class PlusDecoration : public ButtonDecoration,
void SetIcons(int normal_id, int hover_id, int pressed_id);
- scoped_nsobject<ActionBoxMenuBubbleController> menu_controller_;
+ base::scoped_nsobject<ActionBoxMenuBubbleController> menu_controller_;
DISALLOW_COPY_AND_ASSIGN(PlusDecoration);
};
« chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm ('K') | « chrome/browser/ui/cocoa/location_bar/page_action_decoration.h ('k') | chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h » ('j') | content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698