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

Side by Side Diff: ash/common/drag_drop/drag_image_view.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (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 "ash/common/drag_drop/drag_image_view.h" 5 #include "ash/common/drag_drop/drag_image_view.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/common/shell_window_ids.h"
10 #include "ash/common/wm_lookup.h" 9 #include "ash/common/wm_lookup.h"
11 #include "ash/common/wm_root_window_controller.h" 10 #include "ash/common/wm_root_window_controller.h"
12 #include "ash/common/wm_window.h" 11 #include "ash/common/wm_window.h"
12 #include "ash/public/cpp/shell_window_ids.h"
13 #include "skia/ext/image_operations.h" 13 #include "skia/ext/image_operations.h"
14 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/display/display.h" 15 #include "ui/display/display.h"
16 #include "ui/gfx/canvas.h" 16 #include "ui/gfx/canvas.h"
17 #include "ui/resources/grit/ui_resources.h" 17 #include "ui/resources/grit/ui_resources.h"
18 #include "ui/views/widget/widget.h" 18 #include "ui/views/widget/widget.h"
19 19
20 namespace ash { 20 namespace ash {
21 namespace { 21 namespace {
22 using views::Widget; 22 using views::Widget;
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 // Enlarge widget if required to fit the drag hint image. 180 // Enlarge widget if required to fit the drag hint image.
181 if (drag_hint_size.width() > widget_size_.width() || 181 if (drag_hint_size.width() > widget_size_.width() ||
182 drag_hint_size.height() > widget_size_.height()) { 182 drag_hint_size.height() > widget_size_.height()) {
183 gfx::Size new_widget_size = widget_size_; 183 gfx::Size new_widget_size = widget_size_;
184 new_widget_size.SetToMax(drag_hint_size); 184 new_widget_size.SetToMax(drag_hint_size);
185 widget_->SetSize(new_widget_size); 185 widget_->SetSize(new_widget_size);
186 } 186 }
187 } 187 }
188 188
189 } // namespace ash 189 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/accelerators/exit_warning_handler.cc ('k') | ash/common/frame/default_header_painter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698