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

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

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 months 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
12 #if defined(USE_AURA)
13 #include "ui/wm/core/wm_state.h" 11 #include "ui/wm/core/wm_state.h"
14 #endif
15 12
16 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { 13 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
17 } 14 }
18 15
19 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() { 16 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {
20 } 17 }
21 18
22 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() { 19 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
23 // 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
24 // display the correct icon. 21 // display the correct icon.
25 if (!views::ViewsDelegate::views_delegate) 22 if (!views::ViewsDelegate::views_delegate)
26 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; 23 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;
27 24
28 #if defined(USE_AURA)
29 wm_state_.reset(new wm::WMState); 25 wm_state_.reset(new wm::WMState);
30 #endif
31 } 26 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h ('k') | chrome/browser/ui/views/desktop_media_picker_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698