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

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

Issue 10854017: Basic metro snap view omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos compilation. 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 // The modes reflect the different scenarios where a location bar can be used. 141 // The modes reflect the different scenarios where a location bar can be used.
142 // The normal mode is the mode used in a regular browser window. 142 // The normal mode is the mode used in a regular browser window.
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 METRO_SNAP,
151 }; 152 };
152 153
153 LocationBarView(Browser* browser, 154 LocationBarView(Browser* browser,
154 Profile* profile, 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
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 562
562 #if defined(USE_AURA) 563 #if defined(USE_AURA)
563 // Observer for a fade-in animation. 564 // Observer for a fade-in animation.
564 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; 565 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
565 #endif 566 #endif
566 567
567 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 568 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
568 }; 569 };
569 570
570 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 571 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698