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

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

Issue 731423002: Remove OriginChip code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp file and bad merge 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 13 matching lines...) Expand all
24 @class AutocompleteTextField; 24 @class AutocompleteTextField;
25 class CommandUpdater; 25 class CommandUpdater;
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 OriginChipDecoration;
35 class PageActionDecoration; 34 class PageActionDecoration;
36 class Profile; 35 class Profile;
37 class SearchButtonDecoration; 36 class SearchButtonDecoration;
38 class SelectedKeywordDecoration; 37 class SelectedKeywordDecoration;
39 class StarDecoration; 38 class StarDecoration;
40 class TranslateDecoration; 39 class TranslateDecoration;
41 class ZoomDecoration; 40 class ZoomDecoration;
42 class ZoomDecorationTest; 41 class ZoomDecorationTest;
43 42
44 // A C++ bridge class that represents the location bar UI element to 43 // A C++ bridge class that represents the location bar UI element to
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 NSPoint GetPageActionBubblePoint(ExtensionAction* page_action); 154 NSPoint GetPageActionBubblePoint(ExtensionAction* page_action);
156 155
157 // Clears any location bar state stored for |contents|. 156 // Clears any location bar state stored for |contents|.
158 void ResetTabState(content::WebContents* contents); 157 void ResetTabState(content::WebContents* contents);
159 158
160 // OmniboxEditController: 159 // OmniboxEditController:
161 void Update(const content::WebContents* contents) override; 160 void Update(const content::WebContents* contents) override;
162 void OnChanged() override; 161 void OnChanged() override;
163 void OnSetFocus() override; 162 void OnSetFocus() override;
164 void ShowURL() override; 163 void ShowURL() override;
165 void EndOriginChipAnimations(bool cancel_fade) override;
166 InstantController* GetInstant() override; 164 InstantController* GetInstant() override;
167 content::WebContents* GetWebContents() override; 165 content::WebContents* GetWebContents() override;
168 ToolbarModel* GetToolbarModel() override; 166 ToolbarModel* GetToolbarModel() override;
169 const ToolbarModel* GetToolbarModel() const override; 167 const ToolbarModel* GetToolbarModel() const override;
170 168
171 NSImage* GetKeywordImage(const base::string16& keyword); 169 NSImage* GetKeywordImage(const base::string16& keyword);
172 170
173 AutocompleteTextField* GetAutocompleteTextField() { return field_; } 171 AutocompleteTextField* GetAutocompleteTextField() { return field_; }
174 172
175 ManagePasswordsDecoration* manage_passwords_decoration() { 173 ManagePasswordsDecoration* manage_passwords_decoration() {
176 return manage_passwords_decoration_.get(); 174 return manage_passwords_decoration_.get();
177 } 175 }
178 176
179 // SearchModelObserver: 177 // SearchModelObserver:
180 void ModelChanged(const SearchModel::State& old_state, 178 void ModelChanged(const SearchModel::State& old_state,
181 const SearchModel::State& new_state) override; 179 const SearchModel::State& new_state) override;
182 180
183 Browser* browser() const { return browser_; } 181 Browser* browser() const { return browser_; }
184 182
185 // ZoomManagerObserver: 183 // ZoomManagerObserver:
186 // Updates the view for the zoom icon when default zoom levels change. 184 // Updates the view for the zoom icon when default zoom levels change.
187 void OnDefaultZoomLevelChanged() override; 185 void OnDefaultZoomLevelChanged() override;
188 186
189 protected:
190 // OmniboxEditController:
191 void HideURL() override;
192
193 private: 187 private:
194 friend ZoomDecorationTest; 188 friend ZoomDecorationTest;
195 189
196 // Posts |notification| to the default notification center. 190 // Posts |notification| to the default notification center.
197 void PostNotification(NSString* notification); 191 void PostNotification(NSString* notification);
198 192
199 // Return the decoration for |page_action|. 193 // Return the decoration for |page_action|.
200 PageActionDecoration* GetPageActionDecoration(ExtensionAction* page_action); 194 PageActionDecoration* GetPageActionDecoration(ExtensionAction* page_action);
201 195
202 // Clear the page-action decorations. 196 // Clear the page-action decorations.
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 260
267 // The voice search icon. 261 // The voice search icon.
268 scoped_ptr<MicSearchDecoration> mic_search_decoration_; 262 scoped_ptr<MicSearchDecoration> mic_search_decoration_;
269 263
270 // Generated CC hint decoration. 264 // Generated CC hint decoration.
271 scoped_ptr<GeneratedCreditCardDecoration> generated_credit_card_decoration_; 265 scoped_ptr<GeneratedCreditCardDecoration> generated_credit_card_decoration_;
272 266
273 // The right-hand-side search button that is shown on search result pages. 267 // The right-hand-side search button that is shown on search result pages.
274 scoped_ptr<SearchButtonDecoration> search_button_decoration_; 268 scoped_ptr<SearchButtonDecoration> search_button_decoration_;
275 269
276 // The left-hand-side origin chip.
277 scoped_ptr<OriginChipDecoration> origin_chip_decoration_;
278
279 // The right-hand-side button to manage passwords associated with a page. 270 // The right-hand-side button to manage passwords associated with a page.
280 scoped_ptr<ManagePasswordsDecoration> manage_passwords_decoration_; 271 scoped_ptr<ManagePasswordsDecoration> manage_passwords_decoration_;
281 272
282 Browser* browser_; 273 Browser* browser_;
283 274
284 // Used to change the visibility of the star decoration. 275 // Used to change the visibility of the star decoration.
285 BooleanPrefMember edit_bookmarks_enabled_; 276 BooleanPrefMember edit_bookmarks_enabled_;
286 277
287 // Used to schedule a task for the first run info bubble. 278 // Used to schedule a task for the first run info bubble.
288 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 279 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
289 280
290 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 281 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
291 }; 282 };
292 283
293 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 284 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_toolbar_model_delegate.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698