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

Side by Side Diff: chrome/browser/ui/views/tabs/tab_strip.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
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/tabs/tab_strip.h" 5 #include "chrome/browser/ui/views/tabs/tab_strip.h"
6 6
7 #include "app/drag_drop_types.h" 7 #include "app/drag_drop_types.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 } 142 }
143 143
144 void TabStrip::InitTabStripButtons() { 144 void TabStrip::InitTabStripButtons() {
145 newtab_button_ = new NewTabButton(this); 145 newtab_button_ = new NewTabButton(this);
146 if (browser_defaults::kSizeTabButtonToTopOfTabStrip) { 146 if (browser_defaults::kSizeTabButtonToTopOfTabStrip) {
147 newtab_button_->SetImageAlignment(views::ImageButton::ALIGN_LEFT, 147 newtab_button_->SetImageAlignment(views::ImageButton::ALIGN_LEFT,
148 views::ImageButton::ALIGN_BOTTOM); 148 views::ImageButton::ALIGN_BOTTOM);
149 } 149 }
150 LoadNewTabButtonImage(); 150 LoadNewTabButtonImage();
151 newtab_button_->SetAccessibleName( 151 newtab_button_->SetAccessibleName(
152 UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB))); 152 l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
153 AddChildView(newtab_button_); 153 AddChildView(newtab_button_);
154 } 154 }
155 155
156 gfx::Rect TabStrip::GetNewTabButtonBounds() { 156 gfx::Rect TabStrip::GetNewTabButtonBounds() {
157 return newtab_button_->bounds(); 157 return newtab_button_->bounds();
158 } 158 }
159 159
160 void TabStrip::MouseMovedOutOfView() { 160 void TabStrip::MouseMovedOutOfView() {
161 ResizeLayoutTabs(); 161 ResizeLayoutTabs();
162 } 162 }
(...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 int TabStrip::GetAvailableWidthForTabs(Tab* last_tab) const { 968 int TabStrip::GetAvailableWidthForTabs(Tab* last_tab) const {
969 return last_tab->x() + last_tab->width(); 969 return last_tab->x() + last_tab->width();
970 } 970 }
971 971
972 bool TabStrip::IsPointInTab(Tab* tab, 972 bool TabStrip::IsPointInTab(Tab* tab,
973 const gfx::Point& point_in_tabstrip_coords) { 973 const gfx::Point& point_in_tabstrip_coords) {
974 gfx::Point point_in_tab_coords(point_in_tabstrip_coords); 974 gfx::Point point_in_tab_coords(point_in_tabstrip_coords);
975 View::ConvertPointToView(this, tab, &point_in_tab_coords); 975 View::ConvertPointToView(this, tab, &point_in_tab_coords);
976 return tab->HitTest(point_in_tab_coords); 976 return tab->HitTest(point_in_tab_coords);
977 } 977 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698