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

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: Finish mac support; fix pkasting's comments 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 // Returns true if the suggest text is valid. 428 // Returns true if the suggest text is valid.
429 bool HasValidSuggestText() const; 429 bool HasValidSuggestText() const;
430 430
431 // Helper to show the first run info bubble. 431 // Helper to show the first run info bubble.
432 void ShowFirstRunBubbleInternal(); 432 void ShowFirstRunBubbleInternal();
433 433
434 // Draw the background and the left border. 434 // Draw the background and the left border.
435 void PaintActionBoxBackground(gfx::Canvas* canvas, 435 void PaintActionBoxBackground(gfx::Canvas* canvas,
436 const gfx::Rect& content_rect); 436 const gfx::Rect& content_rect);
437 437
438 // Draw backgrounds and borders for page actions. Must be called
439 // after layout, so the |page_action_views_| have their bounds.
440 void PaintPageActionBackgrounds(gfx::Canvas* canvas);
441
438 #if defined(USE_AURA) 442 #if defined(USE_AURA)
439 // 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.
440 void StartFadeAnimation(); 444 void StartFadeAnimation();
441 445
442 // Stops the fade animation, if it is playing. Otherwise does nothing. 446 // Stops the fade animation, if it is playing. Otherwise does nothing.
443 void StopFadeAnimation(); 447 void StopFadeAnimation();
444 448
445 // Cleans up layers used for the animation. 449 // Cleans up layers used for the animation.
446 void CleanupFadeAnimation(); 450 void CleanupFadeAnimation();
447 #endif 451 #endif
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 565
562 #if defined(USE_AURA) 566 #if defined(USE_AURA)
563 // Observer for a fade-in animation. 567 // Observer for a fade-in animation.
564 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; 568 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
565 #endif 569 #endif
566 570
567 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 571 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
568 }; 572 };
569 573
570 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 574 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698