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

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

Issue 10533086: Action box menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Action box menu Created 8 years, 4 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // In popup mode, the location bar view is read only and has a slightly 144 // In popup mode, the location bar view is read only and has a slightly
145 // different presentation (font size / color). 145 // different presentation (font size / color).
146 // In app launcher mode, the location bar is empty and no security states or 146 // In app launcher mode, the location bar is empty and no security states or
147 // page/browser actions are displayed. 147 // page/browser actions are displayed.
148 enum Mode { 148 enum Mode {
149 NORMAL = 0, 149 NORMAL = 0,
150 POPUP, 150 POPUP,
151 APP_LAUNCHER 151 APP_LAUNCHER
152 }; 152 };
153 153
154 LocationBarView(Profile* profile, 154 LocationBarView(Browser* browser,
155 Profile* profile,
155 CommandUpdater* command_updater, 156 CommandUpdater* command_updater,
156 ToolbarModel* model, 157 ToolbarModel* model,
157 Delegate* delegate, 158 Delegate* delegate,
158 chrome::search::SearchModel* search_model, 159 chrome::search::SearchModel* search_model,
159 Mode mode); 160 Mode mode);
160 161
161 virtual ~LocationBarView(); 162 virtual ~LocationBarView();
162 163
163 // Initializes the LocationBarView. See ToolbarView::Init() for a description 164 // Initializes the LocationBarView. See ToolbarView::Init() for a description
164 // of |popup_parent_view|. 165 // of |popup_parent_view|.
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 // Fade in the location bar view so the icons come in gradually. 443 // Fade in the location bar view so the icons come in gradually.
443 void StartFadeAnimation(); 444 void StartFadeAnimation();
444 445
445 // Stops the fade animation, if it is playing. Otherwise does nothing. 446 // Stops the fade animation, if it is playing. Otherwise does nothing.
446 void StopFadeAnimation(); 447 void StopFadeAnimation();
447 448
448 // Cleans up layers used for the animation. 449 // Cleans up layers used for the animation.
449 void CleanupFadeAnimation(); 450 void CleanupFadeAnimation();
450 #endif 451 #endif
451 452
453 // The Browser this LocationBarView is in. Note that at least
454 // chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser
455 // window, so this may be NULL.
456 Browser* browser_;
457
452 // The Autocomplete Edit field. 458 // The Autocomplete Edit field.
453 scoped_ptr<OmniboxView> location_entry_; 459 scoped_ptr<OmniboxView> location_entry_;
454 460
455 // The profile which corresponds to this View. 461 // The profile which corresponds to this View.
456 Profile* profile_; 462 Profile* profile_;
457 463
458 // Command updater which corresponds to this View. 464 // Command updater which corresponds to this View.
459 CommandUpdater* command_updater_; 465 CommandUpdater* command_updater_;
460 466
461 // The model. 467 // The model.
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 568
563 #if defined(USE_AURA) 569 #if defined(USE_AURA)
564 // Observer for a fade-in animation. 570 // Observer for a fade-in animation.
565 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; 571 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
566 #endif 572 #endif
567 573
568 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 574 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
569 }; 575 };
570 576
571 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 577 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698