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

Side by Side Diff: ui/aura/mus/property_converter.cc

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 years, 9 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 | « services/ui/public/interfaces/window_manager_constants.mojom ('k') | ui/base/ui_base_types.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ui/aura/mus/property_converter.h" 5 #include "ui/aura/mus/property_converter.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "mojo/public/cpp/bindings/type_converter.h" 8 #include "mojo/public/cpp/bindings/type_converter.h"
9 #include "services/ui/public/cpp/property_type_converters.h" 9 #include "services/ui/public/cpp/property_type_converters.h"
10 #include "services/ui/public/interfaces/window_manager.mojom.h" 10 #include "services/ui/public/interfaces/window_manager.mojom.h"
(...skipping 28 matching lines...) Expand all
39 ui::mojom::kResizeBehaviorCanMinimize | 39 ui::mojom::kResizeBehaviorCanMinimize |
40 ui::mojom::kResizeBehaviorCanResize); 40 ui::mojom::kResizeBehaviorCanResize);
41 } 41 }
42 42
43 bool ValidateShowState(int64_t value) { 43 bool ValidateShowState(int64_t value) {
44 return value == int64_t(ui::mojom::ShowState::DEFAULT) || 44 return value == int64_t(ui::mojom::ShowState::DEFAULT) ||
45 value == int64_t(ui::mojom::ShowState::NORMAL) || 45 value == int64_t(ui::mojom::ShowState::NORMAL) ||
46 value == int64_t(ui::mojom::ShowState::MINIMIZED) || 46 value == int64_t(ui::mojom::ShowState::MINIMIZED) ||
47 value == int64_t(ui::mojom::ShowState::MAXIMIZED) || 47 value == int64_t(ui::mojom::ShowState::MAXIMIZED) ||
48 value == int64_t(ui::mojom::ShowState::INACTIVE) || 48 value == int64_t(ui::mojom::ShowState::INACTIVE) ||
49 value == int64_t(ui::mojom::ShowState::FULLSCREEN) || 49 value == int64_t(ui::mojom::ShowState::FULLSCREEN);
50 value == int64_t(ui::mojom::ShowState::DOCKED);
51 } 50 }
52 51
53 } // namespace 52 } // namespace
54 53
55 PropertyConverter::PrimitiveProperty::PrimitiveProperty() {} 54 PropertyConverter::PrimitiveProperty::PrimitiveProperty() {}
56 55
57 PropertyConverter::PrimitiveProperty::PrimitiveProperty( 56 PropertyConverter::PrimitiveProperty::PrimitiveProperty(
58 const PrimitiveProperty& property) = default; 57 const PrimitiveProperty& property) = default;
59 58
60 PropertyConverter::PrimitiveProperty::~PrimitiveProperty() {} 59 PropertyConverter::PrimitiveProperty::~PrimitiveProperty() {}
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 } 319 }
321 320
322 void PropertyConverter::RegisterProperty( 321 void PropertyConverter::RegisterProperty(
323 const WindowProperty<base::string16*>* property, 322 const WindowProperty<base::string16*>* property,
324 const char* transport_name) { 323 const char* transport_name) {
325 string16_properties_[property] = transport_name; 324 string16_properties_[property] = transport_name;
326 transport_names_.insert(transport_name); 325 transport_names_.insert(transport_name);
327 } 326 }
328 327
329 } // namespace aura 328 } // namespace aura
OLDNEW
« no previous file with comments | « services/ui/public/interfaces/window_manager_constants.mojom ('k') | ui/base/ui_base_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698