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

Side by Side Diff: ui/wm/core/shadow_controller.cc

Issue 589413002: Fix WeakPtrFactory member ordering in ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 "ui/wm/core/shadow_controller.h" 5 #include "ui/wm/core/shadow_controller.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/linked_ptr.h" 11 #include "base/memory/linked_ptr.h"
12 #include "base/scoped_observer.h" 12 #include "base/scoped_observer.h"
13 #include "ui/aura/env.h" 13 #include "ui/aura/env.h"
14 #include "ui/aura/env_observer.h" 14 #include "ui/aura/env_observer.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 #include "ui/aura/window_event_dispatcher.h" 16 //#include "ui/aura/window_event_dispatcher.h"
17 #include "ui/aura/window_observer.h" 17 #include "ui/aura/window_observer.h"
18 #include "ui/compositor/layer.h" 18 #include "ui/compositor/layer.h"
19 #include "ui/wm/core/shadow.h" 19 #include "ui/wm/core/shadow.h"
20 #include "ui/wm/core/shadow_types.h" 20 #include "ui/wm/core/shadow_types.h"
21 #include "ui/wm/core/window_util.h" 21 #include "ui/wm/core/window_util.h"
22 #include "ui/wm/public/activation_client.h" 22 #include "ui/wm/public/activation_client.h"
23 23
24 using std::make_pair; 24 using std::make_pair;
25 25
26 namespace wm { 26 namespace wm {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 impl_->OnWindowActivated(gained_active, lost_active); 277 impl_->OnWindowActivated(gained_active, lost_active);
278 } 278 }
279 279
280 // ShadowController::TestApi --------------------------------------------------- 280 // ShadowController::TestApi ---------------------------------------------------
281 281
282 Shadow* ShadowController::TestApi::GetShadowForWindow(aura::Window* window) { 282 Shadow* ShadowController::TestApi::GetShadowForWindow(aura::Window* window) {
283 return controller_->impl_->GetShadowForWindow(window); 283 return controller_->impl_->GetShadowForWindow(window);
284 } 284 }
285 285
286 } // namespace wm 286 } // namespace wm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698