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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 12225076: Delete most web intents code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 30 matching lines...) Expand all
41 class LocationBarSeparatorView; 41 class LocationBarSeparatorView;
42 class LocationIconView; 42 class LocationIconView;
43 class OpenPDFInReaderView; 43 class OpenPDFInReaderView;
44 class PageActionWithBadgeView; 44 class PageActionWithBadgeView;
45 class PageActionImageView; 45 class PageActionImageView;
46 class Profile; 46 class Profile;
47 class ScriptBubbleIconView; 47 class ScriptBubbleIconView;
48 class SelectedKeywordView; 48 class SelectedKeywordView;
49 class StarView; 49 class StarView;
50 class TemplateURLService; 50 class TemplateURLService;
51 class WebIntentsButtonView;
52 class ZoomView; 51 class ZoomView;
53 52
54 namespace views { 53 namespace views {
55 class BubbleDelegateView; 54 class BubbleDelegateView;
56 class Label; 55 class Label;
57 class Widget; 56 class Widget;
58 } 57 }
59 58
60 ///////////////////////////////////////////////////////////////////////////// 59 /////////////////////////////////////////////////////////////////////////////
61 // 60 //
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 const InstantSuggestion& suggestion) OVERRIDE; 292 const InstantSuggestion& suggestion) OVERRIDE;
294 virtual string16 GetInputString() const OVERRIDE; 293 virtual string16 GetInputString() const OVERRIDE;
295 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 294 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
296 virtual content::PageTransition GetPageTransition() const OVERRIDE; 295 virtual content::PageTransition GetPageTransition() const OVERRIDE;
297 virtual void AcceptInput() OVERRIDE; 296 virtual void AcceptInput() OVERRIDE;
298 virtual void FocusLocation(bool select_all) OVERRIDE; 297 virtual void FocusLocation(bool select_all) OVERRIDE;
299 virtual void FocusSearch() OVERRIDE; 298 virtual void FocusSearch() OVERRIDE;
300 virtual void UpdateContentSettingsIcons() OVERRIDE; 299 virtual void UpdateContentSettingsIcons() OVERRIDE;
301 virtual void UpdatePageActions() OVERRIDE; 300 virtual void UpdatePageActions() OVERRIDE;
302 virtual void InvalidatePageActions() OVERRIDE; 301 virtual void InvalidatePageActions() OVERRIDE;
303 #if defined(ENABLE_WEB_INTENTS)
304 virtual void UpdateWebIntentsButton() OVERRIDE;
305 #endif
306 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE; 302 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE;
307 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE; 303 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE;
308 virtual void Revert() OVERRIDE; 304 virtual void Revert() OVERRIDE;
309 virtual const OmniboxView* GetLocationEntry() const OVERRIDE; 305 virtual const OmniboxView* GetLocationEntry() const OVERRIDE;
310 virtual OmniboxView* GetLocationEntry() OVERRIDE; 306 virtual OmniboxView* GetLocationEntry() OVERRIDE;
311 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; 307 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
312 308
313 // Overridden from LocationBarTesting: 309 // Overridden from LocationBarTesting:
314 virtual int PageActionCount() OVERRIDE; 310 virtual int PageActionCount() OVERRIDE;
315 virtual int PageActionVisibleCount() OVERRIDE; 311 virtual int PageActionVisibleCount() OVERRIDE;
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 474
479 // The page action icon views. 475 // The page action icon views.
480 PageActionViews page_action_views_; 476 PageActionViews page_action_views_;
481 477
482 // The script bubble. 478 // The script bubble.
483 ScriptBubbleIconView* script_bubble_icon_view_; 479 ScriptBubbleIconView* script_bubble_icon_view_;
484 480
485 // The star. 481 // The star.
486 StarView* star_view_; 482 StarView* star_view_;
487 483
488 #if defined(ENABLE_WEB_INTENTS)
489 // The web intents choose-another-service button
490 WebIntentsButtonView* web_intents_button_view_;
491 #endif
492
493 // The action box button (plus). 484 // The action box button (plus).
494 ActionBoxButtonView* action_box_button_view_; 485 ActionBoxButtonView* action_box_button_view_;
495 486
496 // The mode that dictates how the bar shows. 487 // The mode that dictates how the bar shows.
497 Mode mode_; 488 Mode mode_;
498 489
499 // True if we should show a focus rect while the location entry field is 490 // True if we should show a focus rect while the location entry field is
500 // focused. Used when the toolbar is in full keyboard accessibility mode. 491 // focused. Used when the toolbar is in full keyboard accessibility mode.
501 bool show_focus_rect_; 492 bool show_focus_rect_;
502 493
(...skipping 10 matching lines...) Expand all
513 // in the right location. 504 // in the right location.
514 int animation_offset_; 505 int animation_offset_;
515 506
516 // Used to register for notifications received by NotificationObserver. 507 // Used to register for notifications received by NotificationObserver.
517 content::NotificationRegistrar registrar_; 508 content::NotificationRegistrar registrar_;
518 509
519 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 510 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
520 }; 511 };
521 512
522 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 513 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/external_tab_container_win.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