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

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

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 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 26 matching lines...) Expand all
37 #include "ui/views/event_monitor.h" 37 #include "ui/views/event_monitor.h"
38 #include "ui/views/focus/view_storage.h" 38 #include "ui/views/focus/view_storage.h"
39 #include "ui/views/widget/root_view.h" 39 #include "ui/views/widget/root_view.h"
40 #include "ui/views/widget/widget.h" 40 #include "ui/views/widget/widget.h"
41 41
42 #if defined(USE_ASH) 42 #if defined(USE_ASH)
43 #include "ash/accelerators/accelerator_commands.h" // nogncheck 43 #include "ash/accelerators/accelerator_commands.h" // nogncheck
44 #include "ash/shell.h" // nogncheck 44 #include "ash/shell.h" // nogncheck
45 #include "ash/wm/maximize_mode/maximize_mode_controller.h" // nogncheck 45 #include "ash/wm/maximize_mode/maximize_mode_controller.h" // nogncheck
46 #include "ash/wm/window_state.h" // nogncheck 46 #include "ash/wm/window_state.h" // nogncheck
47 #include "ash/wm/window_state_aura.h" // nogncheck
48 #include "ui/wm/core/coordinate_conversion.h" // nogncheck 47 #include "ui/wm/core/coordinate_conversion.h" // nogncheck
49 #endif 48 #endif
50 49
51 #if defined(USE_AURA) 50 #if defined(USE_AURA)
52 #include "ui/aura/env.h" // nogncheck 51 #include "ui/aura/env.h" // nogncheck
53 #include "ui/aura/window.h" // nogncheck 52 #include "ui/aura/window.h" // nogncheck
54 #include "ui/wm/core/window_modality_controller.h" // nogncheck 53 #include "ui/wm/core/window_modality_controller.h" // nogncheck
55 #endif 54 #endif
56 55
57 using content::OpenURLParams; 56 using content::OpenURLParams;
(...skipping 1734 matching lines...) Expand 10 before | Expand all | Expand 10 after
1792 // TODO(pkotwicz): Fix this properly (crbug.com/358482) 1791 // TODO(pkotwicz): Fix this properly (crbug.com/358482)
1793 for (auto* browser : *BrowserList::GetInstance()) { 1792 for (auto* browser : *BrowserList::GetInstance()) {
1794 if (browser->tab_strip_model()->empty()) 1793 if (browser->tab_strip_model()->empty())
1795 exclude.insert(browser->window()->GetNativeWindow()); 1794 exclude.insert(browser->window()->GetNativeWindow());
1796 } 1795 }
1797 #endif 1796 #endif
1798 base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr()); 1797 base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr());
1799 *window = window_finder_->GetLocalProcessWindowAtPoint(screen_point, exclude); 1798 *window = window_finder_->GetLocalProcessWindowAtPoint(screen_point, exclude);
1800 return ref ? Liveness::ALIVE : Liveness::DELETED; 1799 return ref ? Liveness::ALIVE : Liveness::DELETED;
1801 } 1800 }
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