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

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

Issue 10834279: Give request-to-act badges a grey background, and increase spacing to make it fit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use theme service to pick colors for icon background Created 8 years, 3 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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 // Returns true if the suggest text is valid. 427 // Returns true if the suggest text is valid.
428 bool HasValidSuggestText() const; 428 bool HasValidSuggestText() const;
429 429
430 // Helper to show the first run info bubble. 430 // Helper to show the first run info bubble.
431 void ShowFirstRunBubbleInternal(); 431 void ShowFirstRunBubbleInternal();
432 432
433 // Draw the background and the left border. 433 // Draw the background and the left border.
434 void PaintActionBoxBackground(gfx::Canvas* canvas, 434 void PaintActionBoxBackground(gfx::Canvas* canvas,
435 const gfx::Rect& content_rect); 435 const gfx::Rect& content_rect);
436 436
437 // Draw backgrounds and borders for page actions. Must be called
438 // after layout, so the |page_action_views_| have their bounds.
439 void PaintPageActionBackgrounds(gfx::Canvas* canvas);
440
437 #if defined(USE_AURA) 441 #if defined(USE_AURA)
438 // Fade in the location bar view so the icons come in gradually. 442 // Fade in the location bar view so the icons come in gradually.
439 void StartFadeAnimation(); 443 void StartFadeAnimation();
440 444
441 // Stops the fade animation, if it is playing. Otherwise does nothing. 445 // Stops the fade animation, if it is playing. Otherwise does nothing.
442 void StopFadeAnimation(); 446 void StopFadeAnimation();
443 447
444 // Cleans up layers used for the animation. 448 // Cleans up layers used for the animation.
445 void CleanupFadeAnimation(); 449 void CleanupFadeAnimation();
446 #endif 450 #endif
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 561
558 #if defined(USE_AURA) 562 #if defined(USE_AURA)
559 // Observer for a fade-in animation. 563 // Observer for a fade-in animation.
560 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; 564 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
561 #endif 565 #endif
562 566
563 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 567 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
564 }; 568 };
565 569
566 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 570 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698