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

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

Issue 11262015: Remove unused / unnecessary stuff from Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove SuggestedTextView entirely Created 8 years, 2 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 28 matching lines...) Expand all
39 class GURL; 39 class GURL;
40 class InstantController; 40 class InstantController;
41 class KeywordHintView; 41 class KeywordHintView;
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 SelectedKeywordView; 47 class SelectedKeywordView;
48 class StarView; 48 class StarView;
49 class SuggestedTextView;
50 class TabContents; 49 class TabContents;
51 class TemplateURLService; 50 class TemplateURLService;
52 class WebIntentsButtonView; 51 class WebIntentsButtonView;
53 class ZoomView; 52 class ZoomView;
54 53
55 namespace chrome { 54 namespace chrome {
56 namespace search { 55 namespace search {
57 class SearchModel; 56 class SearchModel;
58 } 57 }
59 } 58 }
60 59
61 namespace views { 60 namespace views {
62 class BubbleDelegateView; 61 class BubbleDelegateView;
62 class Label;
63 class Widget; 63 class Widget;
64 } 64 }
65 65
66 ///////////////////////////////////////////////////////////////////////////// 66 /////////////////////////////////////////////////////////////////////////////
67 // 67 //
68 // LocationBarView class 68 // LocationBarView class
69 // 69 //
70 // The LocationBarView class is a View subclass that paints the background 70 // The LocationBarView class is a View subclass that paints the background
71 // of the URL bar strip and contains its content. 71 // of the URL bar strip and contains its content.
72 // 72 //
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 void ShowStarBubble(const GURL& url, bool newly_bookmarked); 207 void ShowStarBubble(const GURL& url, bool newly_bookmarked);
208 208
209 // Shows the Chrome To Mobile bubble. 209 // Shows the Chrome To Mobile bubble.
210 void ShowChromeToMobileBubble(); 210 void ShowChromeToMobileBubble();
211 211
212 // Returns the screen coordinates of the location entry (where the URL text 212 // Returns the screen coordinates of the location entry (where the URL text
213 // appears, not where the icons are shown). 213 // appears, not where the icons are shown).
214 gfx::Point GetLocationEntryOrigin() const; 214 gfx::Point GetLocationEntryOrigin() const;
215 215
216 // Invoked from OmniboxViewWin to show the instant suggestion. 216 // Invoked from OmniboxViewWin to show the instant suggestion.
217 void SetInstantSuggestion(const string16& text, 217 void SetInstantSuggestion(const string16& text);
218 bool animate_to_complete);
219 218
220 // Returns the current instant suggestion text. 219 // Returns the current instant suggestion text.
221 string16 GetInstantSuggestion() const; 220 string16 GetInstantSuggestion() const;
222 221
223 // Sets whether the location entry can accept focus. 222 // Sets whether the location entry can accept focus.
224 void SetLocationEntryFocusable(bool focusable); 223 void SetLocationEntryFocusable(bool focusable);
225 224
226 // Returns true if the location entry is focusable and visible in 225 // Returns true if the location entry is focusable and visible in
227 // the root view. 226 // the root view.
228 bool IsLocationEntryFocusableInRootView() const; 227 bool IsLocationEntryFocusableInRootView() const;
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 // what is going in the edit. They are all added a children of the 507 // what is going in the edit. They are all added a children of the
509 // LocationBarView. At most one is visible at a time. Preference is 508 // LocationBarView. At most one is visible at a time. Preference is
510 // given to the keyword_view_, then hint_view_. 509 // given to the keyword_view_, then hint_view_.
511 // These autocollapse when the edit needs the room. 510 // These autocollapse when the edit needs the room.
512 511
513 // Shown if the user has selected a keyword. 512 // Shown if the user has selected a keyword.
514 SelectedKeywordView* selected_keyword_view_; 513 SelectedKeywordView* selected_keyword_view_;
515 514
516 // View responsible for showing suggested text. This is NULL when there is no 515 // View responsible for showing suggested text. This is NULL when there is no
517 // suggested text. 516 // suggested text.
518 SuggestedTextView* suggested_text_view_; 517 views::Label* suggested_text_view_;
519 518
520 // Shown if the selected url has a corresponding keyword. 519 // Shown if the selected url has a corresponding keyword.
521 KeywordHintView* keyword_hint_view_; 520 KeywordHintView* keyword_hint_view_;
522 521
523 // The content setting views. 522 // The content setting views.
524 ContentSettingViews content_setting_views_; 523 ContentSettingViews content_setting_views_;
525 524
526 // The zoom icon. 525 // The zoom icon.
527 ZoomView* zoom_view_; 526 ZoomView* zoom_view_;
528 527
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 575
577 #if defined(USE_AURA) 576 #if defined(USE_AURA)
578 // Observer for a fade-in animation. 577 // Observer for a fade-in animation.
579 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; 578 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
580 #endif 579 #endif
581 580
582 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 581 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
583 }; 582 };
584 583
585 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 584 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_view.h ('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