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

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

Issue 11360144: Converts some of the omnibox related classes to support multiple (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 165
166 // Initializes the LocationBarView. 166 // Initializes the LocationBarView.
167 void Init(); 167 void Init();
168 168
169 // True if this instance has been initialized by calling Init, which can only 169 // True if this instance has been initialized by calling Init, which can only
170 // be called when the receiving instance is attached to a view container. 170 // be called when the receiving instance is attached to a view container.
171 bool IsInitialized() const; 171 bool IsInitialized() const;
172 172
173 // Returns the appropriate color for the desired kind, based on the user's 173 // Returns the appropriate color for the desired kind, based on the user's
174 // system theme. 174 // system theme.
175 static SkColor GetColor(ToolbarModel::SecurityLevel security_level, 175 static SkColor GetColor(const ui::NativeTheme* theme,
176 ToolbarModel::SecurityLevel security_level,
176 ColorKind kind); 177 ColorKind kind);
177 178
178 // Updates the location bar. We also reset the bar's permanent text and 179 // Updates the location bar. We also reset the bar's permanent text and
179 // security style, and, if |tab_for_state_restoring| is non-NULL, also restore 180 // security style, and, if |tab_for_state_restoring| is non-NULL, also restore
180 // saved state that the tab holds. 181 // saved state that the tab holds.
181 void Update(const content::WebContents* tab_for_state_restoring); 182 void Update(const content::WebContents* tab_for_state_restoring);
182 183
183 // Returns corresponding profile. 184 // Returns corresponding profile.
184 Profile* profile() const { return profile_; } 185 Profile* profile() const { return profile_; }
185 186
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 572
572 #if defined(USE_AURA) 573 #if defined(USE_AURA)
573 // Observer for a fade-in animation. 574 // Observer for a fade-in animation.
574 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; 575 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
575 #endif 576 #endif
576 577
577 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 578 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
578 }; 579 };
579 580
580 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 581 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698