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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.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_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 25 matching lines...) Expand all
36 class GURL; 36 class GURL;
37 class GeneratedCreditCardView; 37 class GeneratedCreditCardView;
38 class InstantController; 38 class InstantController;
39 class KeywordHintView; 39 class KeywordHintView;
40 class LocationIconView; 40 class LocationIconView;
41 class OpenPDFInReaderView; 41 class OpenPDFInReaderView;
42 class ManagePasswordsIconView; 42 class ManagePasswordsIconView;
43 class PageActionWithBadgeView; 43 class PageActionWithBadgeView;
44 class PageActionImageView; 44 class PageActionImageView;
45 class Profile; 45 class Profile;
46 class SearchButton;
47 class SelectedKeywordView; 46 class SelectedKeywordView;
48 class StarView; 47 class StarView;
49 class TemplateURLService; 48 class TemplateURLService;
50 class TranslateIconView; 49 class TranslateIconView;
51 class ZoomView; 50 class ZoomView;
52 51
53 namespace content { 52 namespace content {
54 struct SSLStatus; 53 struct SSLStatus;
55 } 54 }
56 55
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 461
463 // The page action icon views. 462 // The page action icon views.
464 PageActionViews page_action_views_; 463 PageActionViews page_action_views_;
465 464
466 // The icon for Translate. 465 // The icon for Translate.
467 TranslateIconView* translate_icon_view_; 466 TranslateIconView* translate_icon_view_;
468 467
469 // The star. 468 // The star.
470 StarView* star_view_; 469 StarView* star_view_;
471 470
472 // The search/go button.
473 SearchButton* search_button_;
474
475 // Whether we're in popup mode. This value also controls whether the location 471 // Whether we're in popup mode. This value also controls whether the location
476 // bar is read-only. 472 // bar is read-only.
477 const bool is_popup_mode_; 473 const bool is_popup_mode_;
478 474
479 // True if we should show a focus rect while the location entry field is 475 // True if we should show a focus rect while the location entry field is
480 // focused. Used when the toolbar is in full keyboard accessibility mode. 476 // focused. Used when the toolbar is in full keyboard accessibility mode.
481 bool show_focus_rect_; 477 bool show_focus_rect_;
482 478
483 // This is in case we're destroyed before the model loads. We need to make 479 // This is in case we're destroyed before the model loads. We need to make
484 // Add/RemoveObserver calls. 480 // Add/RemoveObserver calls.
485 TemplateURLService* template_url_service_; 481 TemplateURLService* template_url_service_;
486 482
487 // Tracks this preference to determine whether bookmark editing is allowed. 483 // Tracks this preference to determine whether bookmark editing is allowed.
488 BooleanPrefMember edit_bookmarks_enabled_; 484 BooleanPrefMember edit_bookmarks_enabled_;
489 485
490 // During dropdown animation, the host clips the widget and draws only the 486 // During dropdown animation, the host clips the widget and draws only the
491 // bottom part of it. The view needs to know the pixel offset at which we are 487 // bottom part of it. The view needs to know the pixel offset at which we are
492 // drawing the widget so that we can draw the curved edges that attach to the 488 // drawing the widget so that we can draw the curved edges that attach to the
493 // toolbar in the right location. 489 // toolbar in the right location.
494 int dropdown_animation_offset_; 490 int dropdown_animation_offset_;
495 491
496 // This is a debug state variable that stores if the WebContents was null 492 // This is a debug state variable that stores if the WebContents was null
497 // during the last RefreshPageAction. 493 // during the last RefreshPageAction.
498 bool web_contents_null_at_last_refresh_; 494 bool web_contents_null_at_last_refresh_;
499 495
500 DISALLOW_COPY_AND_ASSIGN(LocationBarView); 496 DISALLOW_COPY_AND_ASSIGN(LocationBarView);
501 }; 497 };
502 498
503 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 499 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_impl.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