| OLD | NEW |
| 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 #include "chrome/browser/views/about_chrome_view.h" | 5 #include "chrome/browser/views/about_chrome_view.h" |
| 6 | 6 |
| 7 #include <commdlg.h> | 7 #include <commdlg.h> |
| 8 | 8 |
| 9 #include "base/file_version_info.h" | 9 #include "base/file_version_info.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| (...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 if (source == terms_of_service_url_) | 588 if (source == terms_of_service_url_) |
| 589 url = GURL(kTOS); | 589 url = GURL(kTOS); |
| 590 else if (source == chromium_url_) | 590 else if (source == chromium_url_) |
| 591 url = GURL(kChromiumUrl); | 591 url = GURL(kChromiumUrl); |
| 592 else if (source == open_source_url_) | 592 else if (source == open_source_url_) |
| 593 url = GURL(kAcknowledgements); | 593 url = GURL(kAcknowledgements); |
| 594 else | 594 else |
| 595 NOTREACHED() << "Unknown link source"; | 595 NOTREACHED() << "Unknown link source"; |
| 596 | 596 |
| 597 Browser* browser = BrowserList::GetLastActive(); | 597 Browser* browser = BrowserList::GetLastActive(); |
| 598 browser->OpenURL(url, NEW_WINDOW, PageTransition::LINK); | 598 browser->OpenURL(url, GURL(), NEW_WINDOW, PageTransition::LINK); |
| 599 } | 599 } |
| 600 | 600 |
| 601 //////////////////////////////////////////////////////////////////////////////// | 601 //////////////////////////////////////////////////////////////////////////////// |
| 602 // AboutChromeView, GoogleUpdateStatusListener implementation: | 602 // AboutChromeView, GoogleUpdateStatusListener implementation: |
| 603 | 603 |
| 604 void AboutChromeView::OnReportResults(GoogleUpdateUpgradeResult result, | 604 void AboutChromeView::OnReportResults(GoogleUpdateUpgradeResult result, |
| 605 GoogleUpdateErrorCode error_code, | 605 GoogleUpdateErrorCode error_code, |
| 606 const std::wstring& version) { | 606 const std::wstring& version) { |
| 607 // Drop the last reference to the object so that it gets cleaned up here. | 607 // Drop the last reference to the object so that it gets cleaned up here. |
| 608 google_updater_ = NULL; | 608 google_updater_ = NULL; |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 706 | 706 |
| 707 // We have updated controls on the parent, so we need to update its layout. | 707 // We have updated controls on the parent, so we need to update its layout. |
| 708 View* parent = GetParent(); | 708 View* parent = GetParent(); |
| 709 parent->Layout(); | 709 parent->Layout(); |
| 710 | 710 |
| 711 // Check button may have appeared/disappeared. We cannot call this during | 711 // Check button may have appeared/disappeared. We cannot call this during |
| 712 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. | 712 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. |
| 713 if (window()) | 713 if (window()) |
| 714 GetDialogClientView()->UpdateDialogButtons(); | 714 GetDialogClientView()->UpdateDialogButtons(); |
| 715 } | 715 } |
| OLD | NEW |