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

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

Issue 6133004: Fix for builder. (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 | « no previous file | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/views/about_chrome_view.h" 5 #include "chrome/browser/views/about_chrome_view.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <commdlg.h> 8 #include <commdlg.h>
9 #endif // defined(OS_WIN) 9 #endif // defined(OS_WIN)
10 10
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 kRelatedControlVerticalSpacing + 296 kRelatedControlVerticalSpacing +
297 // Copyright line. 297 // Copyright line.
298 font.GetHeight() + 298 font.GetHeight() +
299 // Main label. 299 // Main label.
300 dummy_text.GetHeightForWidth( 300 dummy_text.GetHeightForWidth(
301 dialog_dimensions_.width() - (2 * kPanelHorizMargin)) + 301 dialog_dimensions_.width() - (2 * kPanelHorizMargin)) +
302 kRelatedControlVerticalSpacing; 302 kRelatedControlVerticalSpacing;
303 303
304 #if defined(GOOGLE_CHROME_BUILD) 304 #if defined(GOOGLE_CHROME_BUILD)
305 std::vector<size_t> url_offsets; 305 std::vector<size_t> url_offsets;
306 text = l10n_util::GetStringF(IDS_ABOUT_TERMS_OF_SERVICE, 306 text = UTF16ToWide(l10n_util::GetStringFUTF16(IDS_ABOUT_TERMS_OF_SERVICE,
307 std::wstring(), 307 string16(),
308 std::wstring(), 308 string16(),
309 &url_offsets); 309 &url_offsets));
310 310
311 main_label_chunk4_ = text.substr(0, url_offsets[0]); 311 main_label_chunk4_ = text.substr(0, url_offsets[0]);
312 main_label_chunk5_ = text.substr(url_offsets[0]); 312 main_label_chunk5_ = text.substr(url_offsets[0]);
313 313
314 // The Terms of Service URL at the bottom. 314 // The Terms of Service URL at the bottom.
315 terms_of_service_url_ = new views::Link( 315 terms_of_service_url_ = new views::Link(
316 UTF16ToWide(l10n_util::GetStringUTF16(IDS_TERMS_OF_SERVICE))); 316 UTF16ToWide(l10n_util::GetStringUTF16(IDS_TERMS_OF_SERVICE)));
317 AddChildView(terms_of_service_url_); 317 AddChildView(terms_of_service_url_);
318 terms_of_service_url_->SetController(this); 318 terms_of_service_url_->SetController(this);
319 319
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 View* parent = GetParent(); 825 View* parent = GetParent();
826 parent->Layout(); 826 parent->Layout();
827 827
828 // Check button may have appeared/disappeared. We cannot call this during 828 // Check button may have appeared/disappeared. We cannot call this during
829 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. 829 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
830 if (window()) 830 if (window())
831 GetDialogClientView()->UpdateDialogButtons(); 831 GetDialogClientView()->UpdateDialogButtons();
832 } 832 }
833 833
834 #endif 834 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698