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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.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_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 const InstantSuggestion& suggestion) OVERRIDE; 293 const InstantSuggestion& suggestion) OVERRIDE;
294 virtual string16 GetInputString() const OVERRIDE; 294 virtual string16 GetInputString() const OVERRIDE;
295 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 295 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
296 virtual content::PageTransition GetPageTransition() const OVERRIDE; 296 virtual content::PageTransition GetPageTransition() const OVERRIDE;
297 virtual void AcceptInput() OVERRIDE; 297 virtual void AcceptInput() OVERRIDE;
298 virtual void FocusLocation(bool select_all) OVERRIDE; 298 virtual void FocusLocation(bool select_all) OVERRIDE;
299 virtual void FocusSearch() OVERRIDE; 299 virtual void FocusSearch() OVERRIDE;
300 virtual void UpdateContentSettingsIcons() OVERRIDE; 300 virtual void UpdateContentSettingsIcons() OVERRIDE;
301 virtual void UpdatePageActions() OVERRIDE; 301 virtual void UpdatePageActions() OVERRIDE;
302 virtual void InvalidatePageActions() OVERRIDE; 302 virtual void InvalidatePageActions() OVERRIDE;
303 #if defined(ENABLE_WEB_INTENTS)
303 virtual void UpdateWebIntentsButton() OVERRIDE; 304 virtual void UpdateWebIntentsButton() OVERRIDE;
305 #endif
304 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE; 306 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE;
305 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE; 307 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE;
306 virtual void Revert() OVERRIDE; 308 virtual void Revert() OVERRIDE;
307 virtual const OmniboxView* GetLocationEntry() const OVERRIDE; 309 virtual const OmniboxView* GetLocationEntry() const OVERRIDE;
308 virtual OmniboxView* GetLocationEntry() OVERRIDE; 310 virtual OmniboxView* GetLocationEntry() OVERRIDE;
309 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; 311 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
310 312
311 // Overridden from LocationBarTesting: 313 // Overridden from LocationBarTesting:
312 virtual int PageActionCount() OVERRIDE; 314 virtual int PageActionCount() OVERRIDE;
313 virtual int PageActionVisibleCount() OVERRIDE; 315 virtual int PageActionVisibleCount() OVERRIDE;
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 478
477 // The page action icon views. 479 // The page action icon views.
478 PageActionViews page_action_views_; 480 PageActionViews page_action_views_;
479 481
480 // The script bubble. 482 // The script bubble.
481 ScriptBubbleIconView* script_bubble_icon_view_; 483 ScriptBubbleIconView* script_bubble_icon_view_;
482 484
483 // The star. 485 // The star.
484 StarView* star_view_; 486 StarView* star_view_;
485 487
488 #if defined(ENABLE_WEB_INTENTS)
486 // The web intents choose-another-service button 489 // The web intents choose-another-service button
487 WebIntentsButtonView* web_intents_button_view_; 490 WebIntentsButtonView* web_intents_button_view_;
491 #endif
488 492
489 // The action box button (plus). 493 // The action box button (plus).
490 ActionBoxButtonView* action_box_button_view_; 494 ActionBoxButtonView* action_box_button_view_;
491 495
492 // The mode that dictates how the bar shows. 496 // The mode that dictates how the bar shows.
493 Mode mode_; 497 Mode mode_;
494 498
495 // True if we should show a focus rect while the location entry field is 499 // True if we should show a focus rect while the location entry field is
496 // focused. Used when the toolbar is in full keyboard accessibility mode. 500 // focused. Used when the toolbar is in full keyboard accessibility mode.
497 bool show_focus_rect_; 501 bool show_focus_rect_;
(...skipping 11 matching lines...) Expand all
509 // in the right location. 513 // in the right location.
510 int animation_offset_; 514 int animation_offset_;
511 515
512 // Used to register for notifications received by NotificationObserver. 516 // Used to register for notifications received by NotificationObserver.
513 content::NotificationRegistrar registrar_; 517 content::NotificationRegistrar registrar_;
514 518
515 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 519 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
516 }; 520 };
517 521
518 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 522 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/action_box_button_controller.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698