| OLD | NEW |
| 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/about_chrome_view.h" | 5 #include "chrome/browser/ui/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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 574 } else if (source == chromium_url_) { | 574 } else if (source == chromium_url_) { |
| 575 url = google_util::AppendGoogleLocaleParam( | 575 url = google_util::AppendGoogleLocaleParam( |
| 576 GURL(chrome::kChromiumProjectURL)); | 576 GURL(chrome::kChromiumProjectURL)); |
| 577 } else if (source == open_source_url_) { | 577 } else if (source == open_source_url_) { |
| 578 url = GURL(chrome::kChromeUICreditsURL); | 578 url = GURL(chrome::kChromeUICreditsURL); |
| 579 } else { | 579 } else { |
| 580 NOTREACHED() << "Unknown link source"; | 580 NOTREACHED() << "Unknown link source"; |
| 581 } | 581 } |
| 582 | 582 |
| 583 Browser* browser = BrowserList::GetLastActive(); | 583 Browser* browser = BrowserList::GetLastActive(); |
| 584 browser->OpenURL(url, GURL(), NEW_WINDOW, PageTransition::LINK); | 584 browser->OpenURL(url, GURL(), NEW_WINDOW, content::PAGE_TRANSITION_LINK); |
| 585 } | 585 } |
| 586 | 586 |
| 587 #if defined(OS_WIN) && !defined(USE_AURA) | 587 #if defined(OS_WIN) && !defined(USE_AURA) |
| 588 //////////////////////////////////////////////////////////////////////////////// | 588 //////////////////////////////////////////////////////////////////////////////// |
| 589 // AboutChromeView, GoogleUpdateStatusListener implementation: | 589 // AboutChromeView, GoogleUpdateStatusListener implementation: |
| 590 | 590 |
| 591 void AboutChromeView::OnReportResults(GoogleUpdateUpgradeResult result, | 591 void AboutChromeView::OnReportResults(GoogleUpdateUpgradeResult result, |
| 592 GoogleUpdateErrorCode error_code, | 592 GoogleUpdateErrorCode error_code, |
| 593 const string16& version) { | 593 const string16& version) { |
| 594 // Drop the last reference to the object so that it gets cleaned up here. | 594 // Drop the last reference to the object so that it gets cleaned up here. |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 // We have updated controls on the parent, so we need to update its layout. | 723 // We have updated controls on the parent, so we need to update its layout. |
| 724 parent()->Layout(); | 724 parent()->Layout(); |
| 725 | 725 |
| 726 // Check button may have appeared/disappeared. We cannot call this during | 726 // Check button may have appeared/disappeared. We cannot call this during |
| 727 // ViewHierarchyChanged because the view hasn't been added to a Widget yet. | 727 // ViewHierarchyChanged because the view hasn't been added to a Widget yet. |
| 728 if (GetWidget()) | 728 if (GetWidget()) |
| 729 GetDialogClientView()->UpdateDialogButtons(); | 729 GetDialogClientView()->UpdateDialogButtons(); |
| 730 } | 730 } |
| 731 | 731 |
| 732 #endif | 732 #endif |
| OLD | NEW |