ash/sysui/shelf_delegate_mus.cc - Issue 2046563012: mash: Move shelf menu code to //ash/common/shelf

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/sysui/shelf_delegate_mus.cc

Issue 2046563012: mash: Move shelf menu code to //ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« no previous file with comments | « ash/sysui/context_menu_mus.h ('k') | chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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/sysui/shelf_delegate_mus.h"	5 #include "ash/sysui/shelf_delegate_mus.h"

6	6

7 #include <memory>	7 #include <memory>

8	8

9 #include "ash/common/shelf/shelf_item_delegate.h"	9 #include "ash/common/shelf/shelf_item_delegate.h"

10 #include "ash/common/shelf/shelf_item_delegate_manager.h"	10 #include "ash/common/shelf/shelf_item_delegate_manager.h"

	11 #include "ash/common/shelf/shelf_menu_model.h"

11 #include "ash/common/shelf/shelf_model.h"	12 #include "ash/common/shelf/shelf_model.h"

12 #include "ash/common/shelf/shelf_types.h"	13 #include "ash/common/shelf/shelf_types.h"

13 #include "ash/shelf/shelf.h"	14 #include "ash/shelf/shelf.h"

14 #include "ash/shelf/shelf_layout_manager.h"	15 #include "ash/shelf/shelf_layout_manager.h"

15 #include "ash/shelf/shelf_menu_model.h"

16 #include "ash/shelf/shelf_widget.h"	16 #include "ash/shelf/shelf_widget.h"

17 #include "ash/shell.h"	17 #include "ash/shell.h"

18 #include "base/strings/string_util.h"	18 #include "base/strings/string_util.h"

19 #include "components/mus/public/cpp/property_type_converters.h"	19 #include "components/mus/public/cpp/property_type_converters.h"

20 #include "components/mus/public/cpp/window.h"	20 #include "components/mus/public/cpp/window.h"

21 #include "components/mus/public/cpp/window_property.h"	21 #include "components/mus/public/cpp/window_property.h"

22 #include "mojo/common/common_type_converters.h"	22 #include "mojo/common/common_type_converters.h"

23 #include "services/shell/public/cpp/connector.h"	23 #include "services/shell/public/cpp/connector.h"

24 #include "ui/aura/mus/mus_util.h"	24 #include "ui/aura/mus/mus_util.h"

25 #include "ui/base/resource/resource_bundle.h"	25 #include "ui/base/resource/resource_bundle.h"

(...skipping 446 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
472 StatusAreaWidget* status_widget = widget->status_area_widget();	472 StatusAreaWidget* status_widget = widget->status_area_widget();

473 mus::Window* status_window =	473 mus::Window* status_window =

474 aura::GetMusWindow(status_widget->GetNativeWindow());	474 aura::GetMusWindow(status_widget->GetNativeWindow());

475 gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size();	475 gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size();

476 status_window->SetSharedProperty<gfx::Size>(	476 status_window->SetSharedProperty<gfx::Size>(

477 mus::mojom::WindowManager::kPreferredSize_Property, status_size);	477 mus::mojom::WindowManager::kPreferredSize_Property, status_size);

478 }	478 }

479	479

480 } // namespace sysui	480 } // namespace sysui

481 } // namespace ash	481 } // namespace ash

OLD	NEW