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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 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 "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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" // nogncheck 44 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" // nogncheck
45 #include "ash/common/wm/window_state.h" // nogncheck 45 #include "ash/common/wm/window_state.h" // nogncheck
46 #include "ash/common/wm_shell.h" // nogncheck 46 #include "ash/common/wm_shell.h" // nogncheck
47 #include "ash/wm/window_state_aura.h" // nogncheck 47 #include "ash/wm/window_state_aura.h" // nogncheck
48 #include "ui/wm/core/coordinate_conversion.h" // nogncheck 48 #include "ui/wm/core/coordinate_conversion.h" // nogncheck
49 #endif 49 #endif
50 50
51 #if defined(USE_AURA) 51 #if defined(USE_AURA)
52 #include "chrome/browser/ui/views/tabs/window_finder_mus.h" // nogncheck 52 #include "chrome/browser/ui/views/tabs/window_finder_mus.h" // nogncheck
53 #include "content/public/common/service_manager_connection.h" // nogncheck 53 #include "content/public/common/service_manager_connection.h" // nogncheck
54 #include "services/shell/runner/common/client_util.h" // nogncheck 54 #include "services/service_manager/runner/common/client_util.h" // nogncheck
55 #include "ui/aura/env.h" // nogncheck 55 #include "ui/aura/env.h" // nogncheck
56 #include "ui/aura/window.h" // nogncheck 56 #include "ui/aura/window.h" // nogncheck
57 #include "ui/wm/core/window_modality_controller.h" // nogncheck 57 #include "ui/wm/core/window_modality_controller.h" // nogncheck
58 #endif 58 #endif
59 59
60 using base::UserMetricsAction; 60 using base::UserMetricsAction;
61 using content::OpenURLParams; 61 using content::OpenURLParams;
62 using content::WebContents; 62 using content::WebContents;
63 63
64 // If non-null there is a drag underway. 64 // If non-null there is a drag underway.
(...skipping 1781 matching lines...) Expand 10 before | Expand all | Expand 10 after
1846 // TODO(pkotwicz): Fix this properly (crbug.com/358482) 1846 // TODO(pkotwicz): Fix this properly (crbug.com/358482)
1847 for (auto* browser : *BrowserList::GetInstance()) { 1847 for (auto* browser : *BrowserList::GetInstance()) {
1848 if (browser->tab_strip_model()->empty()) 1848 if (browser->tab_strip_model()->empty())
1849 exclude.insert(browser->window()->GetNativeWindow()); 1849 exclude.insert(browser->window()->GetNativeWindow());
1850 } 1850 }
1851 #endif 1851 #endif
1852 base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr()); 1852 base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr());
1853 *window = window_finder_->GetLocalProcessWindowAtPoint(screen_point, exclude); 1853 *window = window_finder_->GetLocalProcessWindowAtPoint(screen_point, exclude);
1854 return ref ? Liveness::ALIVE : Liveness::DELETED; 1854 return ref ? Liveness::ALIVE : Liveness::DELETED;
1855 } 1855 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698