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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 2878133002: mash: Serialize ShelfIDs for property conversion and transport. (Closed)
Patch Set: Address comments. 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/ash/chrome_browser_main_extra_parts_ash.h" 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
6 6
7 #include "ash/public/cpp/mus_property_mirror_ash.h" 7 #include "ash/public/cpp/mus_property_mirror_ash.h"
8 #include "ash/public/cpp/window_pin_type.h" 8 #include "ash/public/cpp/window_pin_type.h"
9 #include "ash/public/cpp/window_properties.h" 9 #include "ash/public/cpp/window_properties.h"
10 #include "ash/public/interfaces/window_pin_type.mojom.h" 10 #include "ash/public/interfaces/window_pin_type.mojom.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 // This propagates ash properties set on chrome windows to ash, via mojo. 46 // This propagates ash properties set on chrome windows to ash, via mojo.
47 DCHECK(views::MusClient::Exists()); 47 DCHECK(views::MusClient::Exists());
48 views::MusClient* mus_client = views::MusClient::Get(); 48 views::MusClient* mus_client = views::MusClient::Get();
49 aura::WindowTreeClientDelegate* delegate = mus_client; 49 aura::WindowTreeClientDelegate* delegate = mus_client;
50 aura::PropertyConverter* converter = delegate->GetPropertyConverter(); 50 aura::PropertyConverter* converter = delegate->GetPropertyConverter();
51 51
52 converter->RegisterProperty( 52 converter->RegisterProperty(
53 ash::kPanelAttachedKey, 53 ash::kPanelAttachedKey,
54 ui::mojom::WindowManager::kPanelAttached_Property, 54 ui::mojom::WindowManager::kPanelAttached_Property,
55 aura::PropertyConverter::CreateAcceptAnyValueCallback()); 55 aura::PropertyConverter::CreateAcceptAnyValueCallback());
56 converter->RegisterProperty(ash::kShelfIDKey,
57 ui::mojom::WindowManager::kShelfID_Property);
56 converter->RegisterProperty( 58 converter->RegisterProperty(
57 ash::kShelfItemTypeKey, 59 ash::kShelfItemTypeKey,
58 ui::mojom::WindowManager::kShelfItemType_Property, 60 ui::mojom::WindowManager::kShelfItemType_Property,
59 base::Bind(&ash::IsValidShelfItemType)); 61 base::Bind(&ash::IsValidShelfItemType));
60 converter->RegisterProperty(ash::kWindowPinTypeKey, 62 converter->RegisterProperty(ash::kWindowPinTypeKey,
61 ash::mojom::kWindowPinType_Property, 63 ash::mojom::kWindowPinType_Property,
62 base::Bind(&ash::IsValidWindowPinType)); 64 base::Bind(&ash::IsValidWindowPinType));
63 65
64 mus_client->SetMusPropertyMirror( 66 mus_client->SetMusPropertyMirror(
65 base::MakeUnique<ash::MusPropertyMirrorAsh>()); 67 base::MakeUnique<ash::MusPropertyMirrorAsh>());
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 vpn_list_forwarder_.reset(); 127 vpn_list_forwarder_.reset();
126 volume_controller_.reset(); 128 volume_controller_.reset();
127 new_window_client_.reset(); 129 new_window_client_.reset();
128 system_tray_client_.reset(); 130 system_tray_client_.reset();
129 media_client_.reset(); 131 media_client_.reset();
130 cast_config_client_media_router_.reset(); 132 cast_config_client_media_router_.reset();
131 session_controller_client_.reset(); 133 session_controller_client_.reset();
132 134
133 ash_init_.reset(); 135 ash_init_.reset();
134 } 136 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/settings_window_observer.cc ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698