OLD | NEW |
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 // In popup mode, the location bar view is read only and has a slightly | 143 // In popup mode, the location bar view is read only and has a slightly |
144 // different presentation (font size / color). | 144 // different presentation (font size / color). |
145 // In app launcher mode, the location bar is empty and no security states or | 145 // In app launcher mode, the location bar is empty and no security states or |
146 // page/browser actions are displayed. | 146 // page/browser actions are displayed. |
147 enum Mode { | 147 enum Mode { |
148 NORMAL = 0, | 148 NORMAL = 0, |
149 POPUP, | 149 POPUP, |
150 APP_LAUNCHER | 150 APP_LAUNCHER |
151 }; | 151 }; |
152 | 152 |
153 LocationBarView(Profile* profile, | 153 LocationBarView(Browser* browser, |
| 154 Profile* profile, |
154 CommandUpdater* command_updater, | 155 CommandUpdater* command_updater, |
155 ToolbarModel* model, | 156 ToolbarModel* model, |
156 Delegate* delegate, | 157 Delegate* delegate, |
157 chrome::search::SearchModel* search_model, | 158 chrome::search::SearchModel* search_model, |
158 Mode mode); | 159 Mode mode); |
159 | 160 |
160 virtual ~LocationBarView(); | 161 virtual ~LocationBarView(); |
161 | 162 |
162 // Initializes the LocationBarView. See ToolbarView::Init() for a description | 163 // Initializes the LocationBarView. See ToolbarView::Init() for a description |
163 // of |popup_parent_view|. | 164 // of |popup_parent_view|. |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
438 // Fade in the location bar view so the icons come in gradually. | 439 // Fade in the location bar view so the icons come in gradually. |
439 void StartFadeAnimation(); | 440 void StartFadeAnimation(); |
440 | 441 |
441 // Stops the fade animation, if it is playing. Otherwise does nothing. | 442 // Stops the fade animation, if it is playing. Otherwise does nothing. |
442 void StopFadeAnimation(); | 443 void StopFadeAnimation(); |
443 | 444 |
444 // Cleans up layers used for the animation. | 445 // Cleans up layers used for the animation. |
445 void CleanupFadeAnimation(); | 446 void CleanupFadeAnimation(); |
446 #endif | 447 #endif |
447 | 448 |
| 449 // The Browser this LocationBarView is in. Note that at least |
| 450 // chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser |
| 451 // window, so this may be NULL. |
| 452 Browser* browser_; |
| 453 |
448 // The Autocomplete Edit field. | 454 // The Autocomplete Edit field. |
449 scoped_ptr<OmniboxView> location_entry_; | 455 scoped_ptr<OmniboxView> location_entry_; |
450 | 456 |
451 // The profile which corresponds to this View. | 457 // The profile which corresponds to this View. |
452 Profile* profile_; | 458 Profile* profile_; |
453 | 459 |
454 // Command updater which corresponds to this View. | 460 // Command updater which corresponds to this View. |
455 CommandUpdater* command_updater_; | 461 CommandUpdater* command_updater_; |
456 | 462 |
457 // The model. | 463 // The model. |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
555 | 561 |
556 #if defined(USE_AURA) | 562 #if defined(USE_AURA) |
557 // Observer for a fade-in animation. | 563 // Observer for a fade-in animation. |
558 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; | 564 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; |
559 #endif | 565 #endif |
560 | 566 |
561 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); | 567 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); |
562 }; | 568 }; |
563 | 569 |
564 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 570 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
OLD | NEW |