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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/page_action_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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_
7 7
8 #include "chrome/browser/extensions/extension_action.h" 8 #include "chrome/browser/extensions/extension_action.h"
9 #include "chrome/browser/extensions/extension_action_icon_factory.h" 9 #include "chrome/browser/extensions/extension_action_icon_factory.h"
10 #import "chrome/browser/ui/cocoa/location_bar/image_decoration.h" 10 #import "chrome/browser/ui/cocoa/location_bar/image_decoration.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // updates to the icon. 97 // updates to the icon.
98 scoped_ptr<ExtensionActionIconFactory> icon_factory_; 98 scoped_ptr<ExtensionActionIconFactory> icon_factory_;
99 99
100 // The tab id we are currently showing the icon for. 100 // The tab id we are currently showing the icon for.
101 int current_tab_id_; 101 int current_tab_id_;
102 102
103 // The URL we are currently showing the icon for. 103 // The URL we are currently showing the icon for.
104 GURL current_url_; 104 GURL current_url_;
105 105
106 // The string to show for a tooltip. 106 // The string to show for a tooltip.
107 scoped_nsobject<NSString> tooltip_; 107 base::scoped_nsobject<NSString> tooltip_;
108 108
109 // The context menu for the Page Action. 109 // The context menu for the Page Action.
110 scoped_nsobject<ExtensionActionContextMenu> menu_; 110 base::scoped_nsobject<ExtensionActionContextMenu> menu_;
111 111
112 // This is used for post-install visual feedback. The page_action 112 // This is used for post-install visual feedback. The page_action
113 // icon is briefly shown even if it hasn't been enabled by its 113 // icon is briefly shown even if it hasn't been enabled by its
114 // extension. 114 // extension.
115 bool preview_enabled_; 115 bool preview_enabled_;
116 116
117 // Fade-in animation for the icon with observer scoped to this. 117 // Fade-in animation for the icon with observer scoped to this.
118 ExtensionAction::IconAnimation::ScopedObserver 118 ExtensionAction::IconAnimation::ScopedObserver
119 scoped_icon_animation_observer_; 119 scoped_icon_animation_observer_;
120 120
121 // Used to register for notifications received by 121 // Used to register for notifications received by
122 // NotificationObserver. 122 // NotificationObserver.
123 content::NotificationRegistrar registrar_; 123 content::NotificationRegistrar registrar_;
124 124
125 DISALLOW_COPY_AND_ASSIGN(PageActionDecoration); 125 DISALLOW_COPY_AND_ASSIGN(PageActionDecoration);
126 }; 126 };
127 127
128 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_ 128 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698