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/ui/views/chrome_views_delegate.h" | 8 #include "chrome/browser/ui/views/chrome_views_delegate.h" |
9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
10 #include "ui/base/ui_base_switches.h" | 10 #include "ui/base/ui_base_switches.h" |
11 | 11 |
12 #if defined(USE_AURA) | 12 #if defined(USE_AURA) |
13 #include "ui/views/corewm/wm_state.h" | 13 #include "ui/wm/core/wm_state.h" |
14 #endif | 14 #endif |
15 | 15 |
16 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { | 16 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { |
17 } | 17 } |
18 | 18 |
19 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() { | 19 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() { |
20 } | 20 } |
21 | 21 |
22 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() { | 22 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() { |
23 // The delegate needs to be set before any UI is created so that windows | 23 // The delegate needs to be set before any UI is created so that windows |
24 // display the correct icon. | 24 // display the correct icon. |
25 if (!views::ViewsDelegate::views_delegate) | 25 if (!views::ViewsDelegate::views_delegate) |
26 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; | 26 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; |
27 | 27 |
28 #if defined(USE_AURA) | 28 #if defined(USE_AURA) |
29 wm_state_.reset(new views::corewm::WMState); | 29 wm_state_.reset(new views::corewm::WMState); |
30 #endif | 30 #endif |
31 } | 31 } |
OLD | NEW |