Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Issue 105813013: Adds views::corewm::WMState to install common state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix viewseventtestbase Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/transient_window_stacking_client.h" 13 #include "ui/views/corewm/wm_state.h"
14 #endif 14 #endif
15 15
16 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { 16 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
17 } 17 }
18 18
19 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {
20 }
21
19 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() { 22 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
20 // 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
21 // display the correct icon. 24 // display the correct icon.
22 if (!views::ViewsDelegate::views_delegate) 25 if (!views::ViewsDelegate::views_delegate)
23 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; 26 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;
24 27
25 #if defined(USE_AURA) 28 #if defined(USE_AURA)
26 // SetWindowStackingClient() takes ownership of TransientWindowStackingClient. 29 wm_state_.reset(new views::corewm::WMState);
27 aura::client::SetWindowStackingClient(
28 new views::corewm::TransientWindowStackingClient);
29 #endif 30 #endif
30 } 31 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h ('k') | chrome/test/base/browser_with_test_window_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698