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

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: impl new design to handle separator in layout system Created 7 years, 11 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) 2013 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
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
(...skipping 19 matching lines...) Expand all
31 31
32 class ActionBoxButtonView; 32 class ActionBoxButtonView;
33 class CommandUpdater; 33 class CommandUpdater;
34 class ContentSettingBubbleModelDelegate; 34 class ContentSettingBubbleModelDelegate;
35 class ContentSettingImageView; 35 class ContentSettingImageView;
36 class EVBubbleView; 36 class EVBubbleView;
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 LocationBarSeparatorView;
41 class LocationIconView; 42 class LocationIconView;
42 class OpenPDFInReaderView; 43 class OpenPDFInReaderView;
43 class PageActionWithBadgeView; 44 class PageActionWithBadgeView;
44 class PageActionImageView; 45 class PageActionImageView;
45 class Profile; 46 class Profile;
46 class ScriptBubbleIconView; 47 class ScriptBubbleIconView;
48 class SearchTokenView;
47 class SelectedKeywordView; 49 class SelectedKeywordView;
48 class StarView; 50 class StarView;
49 class TemplateURLService; 51 class TemplateURLService;
50 class WebIntentsButtonView; 52 class WebIntentsButtonView;
51 class ZoomView; 53 class ZoomView;
52 54
53 namespace views { 55 namespace views {
54 class BubbleDelegateView; 56 class BubbleDelegateView;
55 class Label; 57 class Label;
56 class Widget; 58 class Widget;
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 // Shown if the user has selected a keyword. 450 // Shown if the user has selected a keyword.
449 SelectedKeywordView* selected_keyword_view_; 451 SelectedKeywordView* selected_keyword_view_;
450 452
451 // View responsible for showing suggested text. This is NULL when there is no 453 // View responsible for showing suggested text. This is NULL when there is no
452 // suggested text. 454 // suggested text.
453 views::Label* suggested_text_view_; 455 views::Label* suggested_text_view_;
454 456
455 // Shown if the selected url has a corresponding keyword. 457 // Shown if the selected url has a corresponding keyword.
456 KeywordHintView* keyword_hint_view_; 458 KeywordHintView* keyword_hint_view_;
457 459
460 // View responsible for showing text "<Search provider> Search", which appears
461 // when omnibox replaces the URL with its query terms and there's enough space
462 // in omnibox.
463 SearchTokenView* search_token_view_;
464 LocationBarSeparatorView* search_token_separator_view_;
465
458 // The content setting views. 466 // The content setting views.
459 ContentSettingViews content_setting_views_; 467 ContentSettingViews content_setting_views_;
460 468
461 // The zoom icon. 469 // The zoom icon.
462 ZoomView* zoom_view_; 470 ZoomView* zoom_view_;
463 471
464 // The icon to open a PDF in Reader. 472 // The icon to open a PDF in Reader.
465 OpenPDFInReaderView* open_pdf_in_reader_view_; 473 OpenPDFInReaderView* open_pdf_in_reader_view_;
466 474
467 // The current page actions. 475 // The current page actions.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 // in the right location. 510 // in the right location.
503 int animation_offset_; 511 int animation_offset_;
504 512
505 // Used to register for notifications received by NotificationObserver. 513 // Used to register for notifications received by NotificationObserver.
506 content::NotificationRegistrar registrar_; 514 content::NotificationRegistrar registrar_;
507 515
508 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 516 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
509 }; 517 };
510 518
511 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 519 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698