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

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

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 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
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 27 matching lines...) Expand all
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" 44 #include "ash/accelerators/accelerator_commands.h"
45 #include "ash/shell.h" 45 #include "ash/shell.h"
46 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 46 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
47 #include "ash/wm/window_state.h" 47 #include "ash/wm/window_state.h"
48 #include "ash/wm/window_state_aura.h"
48 #include "ui/wm/core/coordinate_conversion.h" 49 #include "ui/wm/core/coordinate_conversion.h"
49 #endif 50 #endif
50 51
51 #if defined(USE_AURA) 52 #if defined(USE_AURA)
52 #include "ui/aura/env.h" 53 #include "ui/aura/env.h"
53 #include "ui/aura/window.h" 54 #include "ui/aura/window.h"
54 #include "ui/wm/core/window_modality_controller.h" 55 #include "ui/wm/core/window_modality_controller.h"
55 #endif 56 #endif
56 57
57 using base::UserMetricsAction; 58 using base::UserMetricsAction;
(...skipping 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after
1823 // TODO(pkotwicz): Fix this properly (crbug.com/358482) 1824 // TODO(pkotwicz): Fix this properly (crbug.com/358482)
1824 for (auto* browser : *BrowserList::GetInstance()) { 1825 for (auto* browser : *BrowserList::GetInstance()) {
1825 if (browser->tab_strip_model()->empty()) 1826 if (browser->tab_strip_model()->empty())
1826 exclude.insert(browser->window()->GetNativeWindow()); 1827 exclude.insert(browser->window()->GetNativeWindow());
1827 } 1828 }
1828 #endif 1829 #endif
1829 base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr()); 1830 base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr());
1830 *window = window_finder_->GetLocalProcessWindowAtPoint(screen_point, exclude); 1831 *window = window_finder_->GetLocalProcessWindowAtPoint(screen_point, exclude);
1831 return ref ? Liveness::ALIVE : Liveness::DELETED; 1832 return ref ? Liveness::ALIVE : Liveness::DELETED;
1832 } 1833 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/status_bubble_views.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698