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

Side by Side Diff: ash/mus/window_manager.cc

Issue 2879283002: NOSUBMIT: rename builder (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | testing/buildbot/chromium.chromiumos.json » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/mus/window_manager.h" 5 #include "ash/mus/window_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 // TODO: need to register OSExchangeDataProviderMus. http://crbug.com/665077. 76 // TODO: need to register OSExchangeDataProviderMus. http://crbug.com/665077.
77 WindowManager::WindowManager(service_manager::Connector* connector, 77 WindowManager::WindowManager(service_manager::Connector* connector,
78 Config config, 78 Config config,
79 bool show_primary_host_on_connect) 79 bool show_primary_host_on_connect)
80 : connector_(connector), 80 : connector_(connector),
81 config_(config), 81 config_(config),
82 show_primary_host_on_connect_(show_primary_host_on_connect), 82 show_primary_host_on_connect_(show_primary_host_on_connect),
83 wm_state_(base::MakeUnique<::wm::WMState>()), 83 wm_state_(base::MakeUnique<::wm::WMState>()),
84 property_converter_(base::MakeUnique<aura::PropertyConverter>()) { 84 property_converter_(base::MakeUnique<aura::PropertyConverter>()) {
85 LOG(ERROR) << "JAMES force it to compile";
85 property_converter_->RegisterProperty( 86 property_converter_->RegisterProperty(
86 kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property, 87 kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property,
87 aura::PropertyConverter::CreateAcceptAnyValueCallback()); 88 aura::PropertyConverter::CreateAcceptAnyValueCallback());
88 property_converter_->RegisterProperty( 89 property_converter_->RegisterProperty(
89 kRenderTitleAreaProperty, 90 kRenderTitleAreaProperty,
90 ui::mojom::WindowManager::kRenderParentTitleArea_Property, 91 ui::mojom::WindowManager::kRenderParentTitleArea_Property,
91 aura::PropertyConverter::CreateAcceptAnyValueCallback()); 92 aura::PropertyConverter::CreateAcceptAnyValueCallback());
92 property_converter_->RegisterProperty( 93 property_converter_->RegisterProperty(
93 kShelfIDKey, ui::mojom::WindowManager::kShelfID_Property, 94 kShelfIDKey, ui::mojom::WindowManager::kShelfID_Property,
94 aura::PropertyConverter::CreateAcceptAnyValueCallback()); 95 aura::PropertyConverter::CreateAcceptAnyValueCallback());
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 bool WindowManager::IsWindowActive(aura::Window* window) { 583 bool WindowManager::IsWindowActive(aura::Window* window) {
583 return Shell::Get()->activation_client()->GetActiveWindow() == window; 584 return Shell::Get()->activation_client()->GetActiveWindow() == window;
584 } 585 }
585 586
586 void WindowManager::OnWmDeactivateWindow(aura::Window* window) { 587 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
587 Shell::Get()->activation_client()->DeactivateWindow(window); 588 Shell::Get()->activation_client()->DeactivateWindow(window);
588 } 589 }
589 590
590 } // namespace mus 591 } // namespace mus
591 } // namespace ash 592 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698