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

Side by Side Diff: chrome/browser/ui/views/tabs/tab_drag_controller.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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 "chrome/browser/ui/views/tabs/tab_drag_controller.h" 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <set> 8 #include <set>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 24 matching lines...) Expand all
35 #include "ui/events/event_constants.h" 35 #include "ui/events/event_constants.h"
36 #include "ui/events/gestures/gesture_recognizer.h" 36 #include "ui/events/gestures/gesture_recognizer.h"
37 #include "ui/gfx/geometry/point_conversions.h" 37 #include "ui/gfx/geometry/point_conversions.h"
38 #include "ui/views/event_monitor.h" 38 #include "ui/views/event_monitor.h"
39 #include "ui/views/focus/view_storage.h" 39 #include "ui/views/focus/view_storage.h"
40 #include "ui/views/widget/root_view.h" 40 #include "ui/views/widget/root_view.h"
41 #include "ui/views/widget/widget.h" 41 #include "ui/views/widget/widget.h"
42 42
43 #if defined(USE_ASH) 43 #if defined(USE_ASH)
44 #include "ash/accelerators/accelerator_commands.h" // nogncheck 44 #include "ash/accelerators/accelerator_commands.h" // nogncheck
45 #include "ash/common/wm_shell.h" // nogncheck
45 #include "ash/wm/maximize_mode/maximize_mode_controller.h" // nogncheck 46 #include "ash/wm/maximize_mode/maximize_mode_controller.h" // nogncheck
46 #include "ash/wm/window_state.h" // nogncheck 47 #include "ash/wm/window_state.h" // nogncheck
47 #include "ash/wm/window_state_aura.h" // nogncheck 48 #include "ash/wm/window_state_aura.h" // nogncheck
48 #include "ash/wm_shell.h" // nogncheck
49 #include "ui/wm/core/coordinate_conversion.h" // nogncheck 49 #include "ui/wm/core/coordinate_conversion.h" // nogncheck
50 #endif 50 #endif
51 51
52 #if defined(USE_AURA) 52 #if defined(USE_AURA)
53 #include "ui/aura/env.h" // nogncheck 53 #include "ui/aura/env.h" // nogncheck
54 #include "ui/aura/window.h" // nogncheck 54 #include "ui/aura/window.h" // nogncheck
55 #include "ui/wm/core/window_modality_controller.h" // nogncheck 55 #include "ui/wm/core/window_modality_controller.h" // nogncheck
56 #endif 56 #endif
57 57
58 using base::UserMetricsAction; 58 using base::UserMetricsAction;
(...skipping 1736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1795 // TODO(pkotwicz): Fix this properly (crbug.com/358482) 1795 // TODO(pkotwicz): Fix this properly (crbug.com/358482)
1796 for (auto* browser : *BrowserList::GetInstance()) { 1796 for (auto* browser : *BrowserList::GetInstance()) {
1797 if (browser->tab_strip_model()->empty()) 1797 if (browser->tab_strip_model()->empty())
1798 exclude.insert(browser->window()->GetNativeWindow()); 1798 exclude.insert(browser->window()->GetNativeWindow());
1799 } 1799 }
1800 #endif 1800 #endif
1801 base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr()); 1801 base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr());
1802 *window = window_finder_->GetLocalProcessWindowAtPoint(screen_point, exclude); 1802 *window = window_finder_->GetLocalProcessWindowAtPoint(screen_point, exclude);
1803 return ref ? Liveness::ALIVE : Liveness::DELETED; 1803 return ref ? Liveness::ALIVE : Liveness::DELETED;
1804 } 1804 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698