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

Side by Side Diff: ash/common/wm/window_cycle_list.cc

Issue 2390953004: WidgetDelegateView is its own contents view. (Closed)
Patch Set: another minor fix Created 4 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/common/wm/window_cycle_list.h" 5 #include "ash/common/wm/window_cycle_list.h"
6 6
7 #include <list> 7 #include <list>
8 #include <map> 8 #include <map>
9 9
10 #include "ash/common/shell_window_ids.h" 10 #include "ash/common/shell_window_ids.h"
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 // changes other animatable properties. 385 // changes other animatable properties.
386 highlight_view_->layer()->SetAnimator( 386 highlight_view_->layer()->SetAnimator(
387 ui::LayerAnimator::CreateImplicitAnimator()); 387 ui::LayerAnimator::CreateImplicitAnimator());
388 } 388 }
389 } 389 }
390 390
391 void OnMouseCaptureLost() override { 391 void OnMouseCaptureLost() override {
392 WmShell::Get()->window_cycle_controller()->StopCycling(); 392 WmShell::Get()->window_cycle_controller()->StopCycling();
393 } 393 }
394 394
395 View* GetContentsView() override { return this; }
396
397 View* GetInitiallyFocusedView() override { 395 View* GetInitiallyFocusedView() override {
398 return window_view_map_[target_window_]; 396 return window_view_map_[target_window_];
399 } 397 }
400 398
401 WmWindow* target_window() { return target_window_; } 399 WmWindow* target_window() { return target_window_; }
402 400
403 private: 401 private:
404 WindowCycleController::Direction initial_direction_; 402 WindowCycleController::Direction initial_direction_;
405 std::map<WmWindow*, views::View*> window_view_map_; 403 std::map<WmWindow*, views::View*> window_view_map_;
406 views::View* mirror_container_; 404 views::View* mirror_container_;
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 widget->Init(params); 618 widget->Init(params);
621 619
622 screen_observer_.Add(display::Screen::GetScreen()); 620 screen_observer_.Add(display::Screen::GetScreen());
623 widget->Show(); 621 widget->Show();
624 widget->SetCapture(cycle_view_); 622 widget->SetCapture(cycle_view_);
625 widget->set_auto_release_capture(false); 623 widget->set_auto_release_capture(false);
626 cycle_ui_widget_ = widget; 624 cycle_ui_widget_ = widget;
627 } 625 }
628 626
629 } // namespace ash 627 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698