| 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/chrome_browser_main_extra_parts_views.h" | 5 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" |
| 6 | 6 |
| 7 #include "chrome/browser/chrome_browser_main.h" | 7 #include "chrome/browser/chrome_browser_main.h" |
| 8 #include "chrome/browser/toolkit_extra_parts.h" | 8 #include "chrome/browser/toolkit_extra_parts.h" |
| 9 #include "chrome/browser/ui/views/chrome_views_delegate.h" | 9 #include "chrome/browser/ui/views/chrome_views_delegate.h" |
| 10 | 10 |
| 11 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() | 11 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { |
| 12 : ChromeBrowserMainExtraParts() { | |
| 13 } | 12 } |
| 14 | 13 |
| 15 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() { | 14 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() { |
| 16 // The delegate needs to be set before any UI is created so that windows | 15 // The delegate needs to be set before any UI is created so that windows |
| 17 // display the correct icon. | 16 // display the correct icon. |
| 18 if (!views::ViewsDelegate::views_delegate) | 17 if (!views::ViewsDelegate::views_delegate) |
| 19 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; | 18 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; |
| 20 } | 19 } |
| 21 | 20 |
| 22 namespace browser { | 21 namespace browser { |
| 23 | 22 |
| 24 void AddViewsToolkitExtraParts(ChromeBrowserMainParts* main_parts) { | 23 void AddViewsToolkitExtraParts(ChromeBrowserMainParts* main_parts) { |
| 25 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); | 24 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); |
| 26 } | 25 } |
| 27 | 26 |
| 28 } // namespace browser | 27 } // namespace browser |
| OLD | NEW |