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

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

Issue 2778733004: Add WindowPinType property on arua::Window (Closed)
Patch Set: Address review issues. Created 3 years, 8 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_properties.h" 8 #include "ash/public/cpp/window_properties.h"
9 #include "ash/public/interfaces/window_pin_type.mojom.h"
9 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
10 #include "ash/shell.h" 11 #include "ash/shell.h"
11 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
12 #include "chrome/browser/chrome_browser_main.h" 13 #include "chrome/browser/chrome_browser_main.h"
13 #include "chrome/browser/ui/ash/ash_init.h" 14 #include "chrome/browser/ui/ash/ash_init.h"
14 #include "chrome/browser/ui/ash/ash_util.h" 15 #include "chrome/browser/ui/ash/ash_util.h"
15 #include "chrome/browser/ui/ash/cast_config_client_media_router.h" 16 #include "chrome/browser/ui/ash/cast_config_client_media_router.h"
16 #include "chrome/browser/ui/ash/chrome_new_window_client.h" 17 #include "chrome/browser/ui/ash/chrome_new_window_client.h"
17 #include "chrome/browser/ui/ash/chrome_shell_content_state.h" 18 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"
18 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" 19 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
(...skipping 28 matching lines...) Expand all
47 aura::PropertyConverter* converter = delegate->GetPropertyConverter(); 48 aura::PropertyConverter* converter = delegate->GetPropertyConverter();
48 49
49 converter->RegisterProperty( 50 converter->RegisterProperty(
50 ash::kPanelAttachedKey, 51 ash::kPanelAttachedKey,
51 ui::mojom::WindowManager::kPanelAttached_Property, 52 ui::mojom::WindowManager::kPanelAttached_Property,
52 aura::PropertyConverter::CreateAcceptAnyValueCallback()); 53 aura::PropertyConverter::CreateAcceptAnyValueCallback());
53 converter->RegisterProperty( 54 converter->RegisterProperty(
54 ash::kShelfItemTypeKey, 55 ash::kShelfItemTypeKey,
55 ui::mojom::WindowManager::kShelfItemType_Property, 56 ui::mojom::WindowManager::kShelfItemType_Property,
56 base::Bind(&ash::IsValidShelfItemType)); 57 base::Bind(&ash::IsValidShelfItemType));
58 converter->RegisterProperty(
59 ash::kWindowPinTypeKey, ash::mojom::kWindowPinType_Property,
60 aura::PropertyConverter::CreateAcceptAnyValueCallback());
sky 2017/04/04 17:04:57 How come you don't need to validate the property?
Peng 2017/04/04 17:38:00 I thought mojo ipc will verify the ash::mojom::Win
57 61
58 mus_client->SetMusPropertyMirror( 62 mus_client->SetMusPropertyMirror(
59 base::MakeUnique<ash::MusPropertyMirrorAsh>()); 63 base::MakeUnique<ash::MusPropertyMirrorAsh>());
60 } 64 }
61 } 65 }
62 66
63 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { 67 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
64 if (ash_util::ShouldOpenAshOnStartup()) 68 if (ash_util::ShouldOpenAshOnStartup())
65 ash_init_ = base::MakeUnique<AshInit>(); 69 ash_init_ = base::MakeUnique<AshInit>();
66 70
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 vpn_list_forwarder_.reset(); 118 vpn_list_forwarder_.reset();
115 volume_controller_.reset(); 119 volume_controller_.reset();
116 new_window_client_.reset(); 120 new_window_client_.reset();
117 system_tray_client_.reset(); 121 system_tray_client_.reset();
118 media_client_.reset(); 122 media_client_.reset();
119 cast_config_client_media_router_.reset(); 123 cast_config_client_media_router_.reset();
120 session_controller_client_.reset(); 124 session_controller_client_.reset();
121 125
122 ash_init_.reset(); 126 ash_init_.reset();
123 } 127 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698