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

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

Issue 11418229: alternate ntp: implement right-aligned search token (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: prev was rebased, this changes copyright year Created 8 years 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 26 matching lines...) Expand all
37 class ExtensionAction; 37 class ExtensionAction;
38 class GURL; 38 class GURL;
39 class InstantController; 39 class InstantController;
40 class KeywordHintView; 40 class KeywordHintView;
41 class LocationIconView; 41 class LocationIconView;
42 class OpenPDFInReaderView; 42 class OpenPDFInReaderView;
43 class PageActionWithBadgeView; 43 class PageActionWithBadgeView;
44 class PageActionImageView; 44 class PageActionImageView;
45 class Profile; 45 class Profile;
46 class ScriptBubbleIconView; 46 class ScriptBubbleIconView;
47 class SearchTokenView;
47 class SelectedKeywordView; 48 class SelectedKeywordView;
48 class StarView; 49 class StarView;
49 class TemplateURLService; 50 class TemplateURLService;
50 class WebIntentsButtonView; 51 class WebIntentsButtonView;
51 class ZoomView; 52 class ZoomView;
52 53
53 namespace views { 54 namespace views {
54 class BubbleDelegateView; 55 class BubbleDelegateView;
55 class Label; 56 class Label;
56 class Widget; 57 class Widget;
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 // Shown if the user has selected a keyword. 462 // Shown if the user has selected a keyword.
462 SelectedKeywordView* selected_keyword_view_; 463 SelectedKeywordView* selected_keyword_view_;
463 464
464 // View responsible for showing suggested text. This is NULL when there is no 465 // View responsible for showing suggested text. This is NULL when there is no
465 // suggested text. 466 // suggested text.
466 views::Label* suggested_text_view_; 467 views::Label* suggested_text_view_;
467 468
468 // Shown if the selected url has a corresponding keyword. 469 // Shown if the selected url has a corresponding keyword.
469 KeywordHintView* keyword_hint_view_; 470 KeywordHintView* keyword_hint_view_;
470 471
472 // View responsible for showing text "<Search provider> Search", which appears
473 // when omnibox replaces the URL with its query terms and there's enough space
474 // in omnibox.
475 SearchTokenView* search_token_view_;
476
471 // The content setting views. 477 // The content setting views.
472 ContentSettingViews content_setting_views_; 478 ContentSettingViews content_setting_views_;
473 479
474 // The zoom icon. 480 // The zoom icon.
475 ZoomView* zoom_view_; 481 ZoomView* zoom_view_;
476 482
477 // The icon to open a PDF in Reader. 483 // The icon to open a PDF in Reader.
478 OpenPDFInReaderView* open_pdf_in_reader_view_; 484 OpenPDFInReaderView* open_pdf_in_reader_view_;
479 485
480 // The current page actions. 486 // The current page actions.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 // in the right location. 521 // in the right location.
516 int animation_offset_; 522 int animation_offset_;
517 523
518 // Used to register for notifications received by NotificationObserver. 524 // Used to register for notifications received by NotificationObserver.
519 content::NotificationRegistrar registrar_; 525 content::NotificationRegistrar registrar_;
520 526
521 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 527 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
522 }; 528 };
523 529
524 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 530 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698