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

Side by Side Diff: chrome/browser/ui/views/download_shelf_view.cc

Issue 6192007: Remove wstring from views. Part 3: Switch accessibility strings to string16.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/browser/ui/views/download_item_view.cc ('k') | chrome/browser/ui/views/find_bar_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/ui/views/download_shelf_view.h" 5 #include "chrome/browser/ui/views/download_shelf_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 AddChildView(show_all_view_); 109 AddChildView(show_all_view_);
110 110
111 close_button_ = new views::ImageButton(this); 111 close_button_ = new views::ImageButton(this);
112 close_button_->SetImage(views::CustomButton::BS_NORMAL, 112 close_button_->SetImage(views::CustomButton::BS_NORMAL,
113 rb.GetBitmapNamed(IDR_CLOSE_BAR)); 113 rb.GetBitmapNamed(IDR_CLOSE_BAR));
114 close_button_->SetImage(views::CustomButton::BS_HOT, 114 close_button_->SetImage(views::CustomButton::BS_HOT,
115 rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); 115 rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
116 close_button_->SetImage(views::CustomButton::BS_PUSHED, 116 close_button_->SetImage(views::CustomButton::BS_PUSHED,
117 rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); 117 rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
118 close_button_->SetAccessibleName( 118 close_button_->SetAccessibleName(
119 UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE))); 119 l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
120 UpdateButtonColors(); 120 UpdateButtonColors();
121 AddChildView(close_button_); 121 AddChildView(close_button_);
122 122
123 new_item_animation_.reset(new ui::SlideAnimation(this)); 123 new_item_animation_.reset(new ui::SlideAnimation(this));
124 new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs); 124 new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs);
125 125
126 shelf_animation_.reset(new ui::SlideAnimation(this)); 126 shelf_animation_.reset(new ui::SlideAnimation(this));
127 shelf_animation_->SetSlideDuration(kShelfAnimationDurationMs); 127 shelf_animation_->SetSlideDuration(kShelfAnimationDurationMs);
128 Show(); 128 Show();
129 } 129 }
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 const DownloadItemView* download_item_view) { 433 const DownloadItemView* download_item_view) {
434 gfx::Rect bounds = download_item_view->bounds(); 434 gfx::Rect bounds = download_item_view->bounds();
435 435
436 #if defined(TOOLKIT_VIEWS) 436 #if defined(TOOLKIT_VIEWS)
437 bounds.set_height(bounds.height() - 1); 437 bounds.set_height(bounds.height() - 1);
438 bounds.Offset(0, 3); 438 bounds.Offset(0, 3);
439 #endif 439 #endif
440 440
441 return bounds; 441 return bounds;
442 } 442 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/download_item_view.cc ('k') | chrome/browser/ui/views/find_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698