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

Side by Side Diff: chrome/browser/views/download_shelf_view.h

Issue 165372: Merge 22980 - Mask the close button on the download shelf so that it's visibl... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 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
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/views/download_shelf_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/chrome/browser/views/download_shelf_view.h:r69-2775
Merged /trunk/src/chrome/browser/views/download_shelf_view.h:r22980
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_VIEWS_DOWNLOAD_SHELF_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_
7 7
8 #include "app/slide_animation.h" 8 #include "app/slide_animation.h"
9 #include "chrome/browser/download/download_shelf.h" 9 #include "chrome/browser/download/download_shelf.h"
10 #include "views/controls/button/button.h" 10 #include "views/controls/button/button.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // DownloadShelfView takes ownership of the View, and will delete it as 74 // DownloadShelfView takes ownership of the View, and will delete it as
75 // necessary. 75 // necessary.
76 void AddDownloadView(views::View* view); 76 void AddDownloadView(views::View* view);
77 77
78 // Paints the border. 78 // Paints the border.
79 void PaintBorder(gfx::Canvas* canvas); 79 void PaintBorder(gfx::Canvas* canvas);
80 80
81 // Returns true if the shelf is wide enough to show the first download item. 81 // Returns true if the shelf is wide enough to show the first download item.
82 bool CanFitFirstDownloadItem(); 82 bool CanFitFirstDownloadItem();
83 83
84 // Called on theme change.
85 void UpdateButtonColors();
86
87 // Overridden from views::View.
88 virtual void ThemeChanged();
89
84 // The browser for this shelf. 90 // The browser for this shelf.
85 Browser* browser_; 91 Browser* browser_;
86 92
87 // The animation for adding new items to the shelf. 93 // The animation for adding new items to the shelf.
88 scoped_ptr<SlideAnimation> new_item_animation_; 94 scoped_ptr<SlideAnimation> new_item_animation_;
89 95
90 // The show/hide animation for the shelf itself. 96 // The show/hide animation for the shelf itself.
91 scoped_ptr<SlideAnimation> shelf_animation_; 97 scoped_ptr<SlideAnimation> shelf_animation_;
92 98
93 // The download views. These are also child Views, and deleted when 99 // The download views. These are also child Views, and deleted when
(...skipping 11 matching lines...) Expand all
105 // deleted by View. 111 // deleted by View.
106 views::ImageButton* close_button_; 112 views::ImageButton* close_button_;
107 113
108 // The window this shelf belongs to. 114 // The window this shelf belongs to.
109 BrowserView* parent_; 115 BrowserView* parent_;
110 116
111 DISALLOW_COPY_AND_ASSIGN(DownloadShelfView); 117 DISALLOW_COPY_AND_ASSIGN(DownloadShelfView);
112 }; 118 };
113 119
114 #endif // CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_ 120 #endif // CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/views/download_shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698