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

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

Issue 749693005: Remove SearchButton. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no-origin-2
Patch Set: Merge to HEAD Created 5 years, 10 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 15 matching lines...) Expand all
26 class ContentSettingDecoration; 26 class ContentSettingDecoration;
27 class EVBubbleDecoration; 27 class EVBubbleDecoration;
28 class GeneratedCreditCardDecoration; 28 class GeneratedCreditCardDecoration;
29 class KeywordHintDecoration; 29 class KeywordHintDecoration;
30 class LocationBarDecoration; 30 class LocationBarDecoration;
31 class LocationIconDecoration; 31 class LocationIconDecoration;
32 class ManagePasswordsDecoration; 32 class ManagePasswordsDecoration;
33 class MicSearchDecoration; 33 class MicSearchDecoration;
34 class PageActionDecoration; 34 class PageActionDecoration;
35 class Profile; 35 class Profile;
36 class SearchButtonDecoration;
37 class SelectedKeywordDecoration; 36 class SelectedKeywordDecoration;
38 class StarDecoration; 37 class StarDecoration;
39 class TranslateDecoration; 38 class TranslateDecoration;
40 class ZoomDecoration; 39 class ZoomDecoration;
41 class ZoomDecorationTest; 40 class ZoomDecorationTest;
42 41
43 // A C++ bridge class that represents the location bar UI element to 42 // A C++ bridge class that represents the location bar UI element to
44 // the portable code. Wires up an OmniboxViewMac instance to 43 // the portable code. Wires up an OmniboxViewMac instance to
45 // the location bar text field, which handles most of the work. 44 // the location bar text field, which handles most of the work.
46 45
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 256
258 // Keyword hint decoration displayed on the right-hand side. 257 // Keyword hint decoration displayed on the right-hand side.
259 scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_; 258 scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_;
260 259
261 // The voice search icon. 260 // The voice search icon.
262 scoped_ptr<MicSearchDecoration> mic_search_decoration_; 261 scoped_ptr<MicSearchDecoration> mic_search_decoration_;
263 262
264 // Generated CC hint decoration. 263 // Generated CC hint decoration.
265 scoped_ptr<GeneratedCreditCardDecoration> generated_credit_card_decoration_; 264 scoped_ptr<GeneratedCreditCardDecoration> generated_credit_card_decoration_;
266 265
267 // The right-hand-side search button that is shown on search result pages.
268 scoped_ptr<SearchButtonDecoration> search_button_decoration_;
269
270 // The right-hand-side button to manage passwords associated with a page. 266 // The right-hand-side button to manage passwords associated with a page.
271 scoped_ptr<ManagePasswordsDecoration> manage_passwords_decoration_; 267 scoped_ptr<ManagePasswordsDecoration> manage_passwords_decoration_;
272 268
273 Browser* browser_; 269 Browser* browser_;
274 270
275 // Used to change the visibility of the star decoration. 271 // Used to change the visibility of the star decoration.
276 BooleanPrefMember edit_bookmarks_enabled_; 272 BooleanPrefMember edit_bookmarks_enabled_;
277 273
278 // Used to schedule a task for the first run info bubble. 274 // Used to schedule a task for the first run info bubble.
279 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 275 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
280 276
281 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 277 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
282 }; 278 };
283 279
284 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 280 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698