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

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

Issue 1851883002: Cleanup shelf initialization and observation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Check for shelf before setting prefs in ChromeLauncherController. Created 4 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 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/mus/shelf_delegate_mus.h" 5 #include "ash/mus/shelf_delegate_mus.h"
6 6
7 #include "ash/shelf/shelf.h" 7 #include "ash/shelf/shelf.h"
8 #include "ash/shelf/shelf_item_delegate.h" 8 #include "ash/shelf/shelf_item_delegate.h"
9 #include "ash/shelf/shelf_item_delegate_manager.h" 9 #include "ash/shelf/shelf_item_delegate_manager.h"
10 #include "ash/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 aura::GetMusWindow(status_widget->GetNativeWindow()); 123 aura::GetMusWindow(status_widget->GetNativeWindow());
124 gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size(); 124 gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size();
125 status_window->SetSharedProperty<gfx::Size>( 125 status_window->SetSharedProperty<gfx::Size>(
126 mus::mojom::WindowManager::kPreferredSize_Property, status_size); 126 mus::mojom::WindowManager::kPreferredSize_Property, status_size);
127 } 127 }
128 128
129 void ShelfDelegateMus::OnShelfDestroyed(Shelf* shelf) { 129 void ShelfDelegateMus::OnShelfDestroyed(Shelf* shelf) {
130 NOTIMPLEMENTED(); 130 NOTIMPLEMENTED();
131 } 131 }
132 132
133 void ShelfDelegateMus::OnShelfAlignmentChanged(Shelf* shelf) {
134 NOTIMPLEMENTED();
135 }
136
137 void ShelfDelegateMus::OnShelfAutoHideBehaviorChanged(Shelf* shelf) {
138 NOTIMPLEMENTED();
139 }
140
133 ShelfID ShelfDelegateMus::GetShelfIDForAppID(const std::string& app_id) { 141 ShelfID ShelfDelegateMus::GetShelfIDForAppID(const std::string& app_id) {
134 NOTIMPLEMENTED(); 142 NOTIMPLEMENTED();
135 return 0; 143 return 0;
136 } 144 }
137 145
138 bool ShelfDelegateMus::HasShelfIDToAppIDMapping(ShelfID id) const { 146 bool ShelfDelegateMus::HasShelfIDToAppIDMapping(ShelfID id) const {
139 NOTIMPLEMENTED(); 147 NOTIMPLEMENTED();
140 return false; 148 return false;
141 } 149 }
142 150
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 DCHECK_GE(index, 0); 244 DCHECK_GE(index, 0);
237 ShelfItems::const_iterator iter = model_->ItemByID(shelf_id); 245 ShelfItems::const_iterator iter = model_->ItemByID(shelf_id);
238 DCHECK(iter != model_->items().end()); 246 DCHECK(iter != model_->items().end());
239 ShelfItem item = *iter; 247 ShelfItem item = *iter;
240 item.status = has_focus ? STATUS_ACTIVE : STATUS_RUNNING; 248 item.status = has_focus ? STATUS_ACTIVE : STATUS_RUNNING;
241 model_->Set(index, item); 249 model_->Set(index, item);
242 } 250 }
243 251
244 } // namespace sysui 252 } // namespace sysui
245 } // namespace ash 253 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698