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

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

Issue 12089102: Make most code on mac compile with enable_web_intents=0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ffff Created 7 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 | 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_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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 const InstantSuggestion& suggestion) OVERRIDE; 63 const InstantSuggestion& suggestion) OVERRIDE;
64 virtual string16 GetInputString() const OVERRIDE; 64 virtual string16 GetInputString() const OVERRIDE;
65 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 65 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
66 virtual content::PageTransition GetPageTransition() const OVERRIDE; 66 virtual content::PageTransition GetPageTransition() const OVERRIDE;
67 virtual void AcceptInput() OVERRIDE; 67 virtual void AcceptInput() OVERRIDE;
68 virtual void FocusLocation(bool select_all) OVERRIDE; 68 virtual void FocusLocation(bool select_all) OVERRIDE;
69 virtual void FocusSearch() OVERRIDE; 69 virtual void FocusSearch() OVERRIDE;
70 virtual void UpdateContentSettingsIcons() OVERRIDE; 70 virtual void UpdateContentSettingsIcons() OVERRIDE;
71 virtual void UpdatePageActions() OVERRIDE; 71 virtual void UpdatePageActions() OVERRIDE;
72 virtual void InvalidatePageActions() OVERRIDE; 72 virtual void InvalidatePageActions() OVERRIDE;
73 #if defined(ENABLE_WEB_INTENTS)
73 virtual void UpdateWebIntentsButton() OVERRIDE; 74 virtual void UpdateWebIntentsButton() OVERRIDE;
75 #endif
74 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE; 76 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE;
75 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE; 77 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE;
76 virtual void Revert() OVERRIDE; 78 virtual void Revert() OVERRIDE;
77 virtual const OmniboxView* GetLocationEntry() const OVERRIDE; 79 virtual const OmniboxView* GetLocationEntry() const OVERRIDE;
78 virtual OmniboxView* GetLocationEntry() OVERRIDE; 80 virtual OmniboxView* GetLocationEntry() OVERRIDE;
79 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; 81 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
80 82
81 // Overridden from LocationBarTesting: 83 // Overridden from LocationBarTesting:
82 virtual int PageActionCount() OVERRIDE; 84 virtual int PageActionCount() OVERRIDE;
83 virtual int PageActionVisibleCount() OVERRIDE; 85 virtual int PageActionVisibleCount() OVERRIDE;
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 273
272 // Decorations for the installed Page Actions. 274 // Decorations for the installed Page Actions.
273 ScopedVector<PageActionDecoration> page_action_decorations_; 275 ScopedVector<PageActionDecoration> page_action_decorations_;
274 276
275 // The content blocked decorations. 277 // The content blocked decorations.
276 ScopedVector<ContentSettingDecoration> content_setting_decorations_; 278 ScopedVector<ContentSettingDecoration> content_setting_decorations_;
277 279
278 // Keyword hint decoration displayed on the right-hand side. 280 // Keyword hint decoration displayed on the right-hand side.
279 scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_; 281 scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_;
280 282
283 #if defined(ENABLE_WEB_INTENTS)
281 // A decoration that shows the web intents "use another service" button 284 // A decoration that shows the web intents "use another service" button
282 // on the right. 285 // on the right.
283 scoped_ptr<WebIntentsButtonDecoration> web_intents_button_decoration_; 286 scoped_ptr<WebIntentsButtonDecoration> web_intents_button_decoration_;
287 #endif
284 288
285 Profile* profile_; 289 Profile* profile_;
286 290
287 Browser* browser_; 291 Browser* browser_;
288 292
289 ToolbarModel* toolbar_model_; // Weak, owned by Browser. 293 ToolbarModel* toolbar_model_; // Weak, owned by Browser.
290 294
291 // The transition type to use for the navigation. 295 // The transition type to use for the navigation.
292 content::PageTransition transition_; 296 content::PageTransition transition_;
293 297
294 // Used to register for notifications received by NotificationObserver. 298 // Used to register for notifications received by NotificationObserver.
295 content::NotificationRegistrar registrar_; 299 content::NotificationRegistrar registrar_;
296 300
297 // Used to schedule a task for the first run info bubble. 301 // Used to schedule a task for the first run info bubble.
298 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 302 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
299 303
300 // Used to change the visibility of the star decoration. 304 // Used to change the visibility of the star decoration.
301 BooleanPrefMember edit_bookmarks_enabled_; 305 BooleanPrefMember edit_bookmarks_enabled_;
302 306
303 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 307 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
304 }; 308 };
305 309
306 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 310 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_tab_contents.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