| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 DCHECK(end > start); | 85 DCHECK(end > start); |
| 86 return text.substr(start, end - start); | 86 return text.substr(start, end - start); |
| 87 } | 87 } |
| 88 | 88 |
| 89 } // namespace | 89 } // namespace |
| 90 | 90 |
| 91 namespace browser { | 91 namespace browser { |
| 92 | 92 |
| 93 // Declared in browser_dialogs.h so that others don't | 93 // Declared in browser_dialogs.h so that others don't |
| 94 // need to depend on our .h. | 94 // need to depend on our .h. |
| 95 views::Widget* ShowAboutChromeView(gfx::NativeWindow parent, Profile* profile) { | 95 void ShowAboutChromeView(gfx::NativeWindow parent, Profile* profile) { |
| 96 views::Widget* window = views::Widget::CreateWindowWithParent( | 96 views::Widget* window = views::Widget::CreateWindowWithParent( |
| 97 new AboutChromeView(profile), parent); | 97 new AboutChromeView(profile), parent); |
| 98 window->Show(); | 98 window->Show(); |
| 99 return window; | |
| 100 } | 99 } |
| 101 | 100 |
| 102 } // namespace browser | 101 } // namespace browser |
| 103 | 102 |
| 104 //////////////////////////////////////////////////////////////////////////////// | 103 //////////////////////////////////////////////////////////////////////////////// |
| 105 // AboutChromeView, public: | 104 // AboutChromeView, public: |
| 106 | 105 |
| 107 AboutChromeView::AboutChromeView(Profile* profile) | 106 AboutChromeView::AboutChromeView(Profile* profile) |
| 108 : profile_(profile), | 107 : profile_(profile), |
| 109 about_dlg_background_logo_(NULL), | 108 about_dlg_background_logo_(NULL), |
| (...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 792 int height = error_label_->GetHeightForWidth( | 791 int height = error_label_->GetHeightForWidth( |
| 793 dialog_dimensions_.width() - (2 * views::kPanelHorizMargin)) + | 792 dialog_dimensions_.width() - (2 * views::kPanelHorizMargin)) + |
| 794 views::kRelatedControlVerticalSpacing; | 793 views::kRelatedControlVerticalSpacing; |
| 795 window_rect.set_height(window_rect.height() + height); | 794 window_rect.set_height(window_rect.height() + height); |
| 796 GetWidget()->SetBounds(window_rect); | 795 GetWidget()->SetBounds(window_rect); |
| 797 | 796 |
| 798 return height; | 797 return height; |
| 799 } | 798 } |
| 800 | 799 |
| 801 #endif | 800 #endif |
| OLD | NEW |