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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

Issue 1570153003: Use MacViews for ContentSettingBubbles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
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_LOCATION_BAR_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #import <Cocoa/Cocoa.h> 10 #import <Cocoa/Cocoa.h>
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h" 21 #include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h"
22 #include "components/content_settings/core/common/content_settings_types.h" 22 #include "components/content_settings/core/common/content_settings_types.h"
23 #include "components/ui/zoom/zoom_event_manager_observer.h" 23 #include "components/ui/zoom/zoom_event_manager_observer.h"
24 24
25 @class AutocompleteTextField; 25 @class AutocompleteTextField;
26 class CommandUpdater; 26 class CommandUpdater;
27 class ContentSettingDecoration; 27 class ContentSettingDecoration;
28 class EVBubbleDecoration; 28 class EVBubbleDecoration;
29 class KeywordHintDecoration; 29 class KeywordHintDecoration;
30 class LocationBarDecoration; 30 class LocationBarDecoration;
31 class LocationBarViewDecoration;
31 class LocationIconDecoration; 32 class LocationIconDecoration;
32 class ManagePasswordsDecoration; 33 class ManagePasswordsDecoration;
33 class PageActionDecoration; 34 class PageActionDecoration;
34 class Profile; 35 class Profile;
35 class SaveCreditCardDecoration; 36 class SaveCreditCardDecoration;
36 class SelectedKeywordDecoration; 37 class SelectedKeywordDecoration;
37 class StarDecoration; 38 class StarDecoration;
38 class TranslateDecoration; 39 class TranslateDecoration;
39 class ZoomDecoration; 40 class ZoomDecoration;
40 class ZoomDecorationTest; 41 class ZoomDecorationTest;
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // A decoration that shows a lock icon and ev-cert label in a bubble 233 // A decoration that shows a lock icon and ev-cert label in a bubble
233 // on the left. 234 // on the left.
234 scoped_ptr<EVBubbleDecoration> ev_bubble_decoration_; 235 scoped_ptr<EVBubbleDecoration> ev_bubble_decoration_;
235 236
236 // Save credit card icon on the right side of the omnibox. 237 // Save credit card icon on the right side of the omnibox.
237 scoped_ptr<SaveCreditCardDecoration> save_credit_card_decoration_; 238 scoped_ptr<SaveCreditCardDecoration> save_credit_card_decoration_;
238 239
239 // Bookmark star right of page actions. 240 // Bookmark star right of page actions.
240 scoped_ptr<StarDecoration> star_decoration_; 241 scoped_ptr<StarDecoration> star_decoration_;
241 242
243 scoped_ptr<LocationBarViewDecoration> test_decoration_;
tapted 2016/01/11 02:50:58 Is this bit used?
244
242 // Translate icon at the end of the ominibox. 245 // Translate icon at the end of the ominibox.
243 scoped_ptr<TranslateDecoration> translate_decoration_; 246 scoped_ptr<TranslateDecoration> translate_decoration_;
244 247
245 // A zoom icon at the end of the omnibox, which shows at non-standard zoom 248 // A zoom icon at the end of the omnibox, which shows at non-standard zoom
246 // levels. 249 // levels.
247 scoped_ptr<ZoomDecoration> zoom_decoration_; 250 scoped_ptr<ZoomDecoration> zoom_decoration_;
248 251
249 // Decorations for the installed Page Actions. 252 // Decorations for the installed Page Actions.
250 ScopedVector<PageActionDecoration> page_action_decorations_; 253 ScopedVector<PageActionDecoration> page_action_decorations_;
251 254
(...skipping 14 matching lines...) Expand all
266 // Indicates whether or not the location bar is currently visible. 269 // Indicates whether or not the location bar is currently visible.
267 bool location_bar_visible_; 270 bool location_bar_visible_;
268 271
269 // Used to schedule a task for the first run info bubble. 272 // Used to schedule a task for the first run info bubble.
270 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 273 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
271 274
272 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 275 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
273 }; 276 };
274 277
275 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 278 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698