| 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/chrome_browser_parts_views.h" | 5 #include "chrome/browser/chrome_browser_parts_views.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "chrome/browser/ui/views/chrome_views_delegate.h" | 10 #include "chrome/browser/ui/views/chrome_views_delegate.h" |
| 11 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 12 #include "views/desktop/desktop_window_view.h" | 12 #include "ui/views/desktop/desktop_window_view.h" |
| 13 #include "views/widget/widget.h" | 13 #include "views/widget/widget.h" |
| 14 | 14 |
| 15 ChromeBrowserPartsViews::ChromeBrowserPartsViews() | 15 ChromeBrowserPartsViews::ChromeBrowserPartsViews() |
| 16 : content::BrowserMainParts() { | 16 : content::BrowserMainParts() { |
| 17 } | 17 } |
| 18 | 18 |
| 19 void ChromeBrowserPartsViews::ToolkitInitialized() { | 19 void ChromeBrowserPartsViews::ToolkitInitialized() { |
| 20 // The delegate needs to be set before any UI is created so that windows | 20 // The delegate needs to be set before any UI is created so that windows |
| 21 // display the correct icon. | 21 // display the correct icon. |
| 22 if (!views::ViewsDelegate::views_delegate) | 22 if (!views::ViewsDelegate::views_delegate) |
| (...skipping 28 matching lines...) Expand all Loading... |
| 51 chrome_views_delegate->default_parent_view = | 51 chrome_views_delegate->default_parent_view = |
| 52 views::desktop::DesktopWindowView::desktop_window_view; | 52 views::desktop::DesktopWindowView::desktop_window_view; |
| 53 } | 53 } |
| 54 } | 54 } |
| 55 #endif | 55 #endif |
| 56 } | 56 } |
| 57 | 57 |
| 58 bool ChromeBrowserPartsViews::MainMessageLoopRun(int* result_code) { | 58 bool ChromeBrowserPartsViews::MainMessageLoopRun(int* result_code) { |
| 59 return false; | 59 return false; |
| 60 } | 60 } |
| OLD | NEW |