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

Side by Side Diff: ash/app_list/app_list_presenter_delegate.cc

Issue 2615743002: cros: Fix clusterfuzz crash when spawning app list very early in startup (Closed)
Patch Set: Created 3 years, 11 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 "ash/app_list/app_list_presenter_delegate.h" 5 #include "ash/app_list/app_list_presenter_delegate.h"
6 6
7 #include "ash/aura/wm_window_aura.h" 7 #include "ash/aura/wm_window_aura.h"
8 #include "ash/common/ash_switches.h" 8 #include "ash/common/ash_switches.h"
9 #include "ash/common/shelf/app_list_button.h" 9 #include "ash/common/shelf/app_list_button.h"
10 #include "ash/common/shelf/shelf_layout_manager.h" 10 #include "ash/common/shelf/shelf_layout_manager.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 ->GetShelfLayoutManager() 106 ->GetShelfLayoutManager()
107 ->UpdateAutoHideState(); 107 ->UpdateAutoHideState();
108 view_ = view; 108 view_ = view;
109 aura::Window* root_window = Shell::GetInstance() 109 aura::Window* root_window = Shell::GetInstance()
110 ->window_tree_host_manager() 110 ->window_tree_host_manager()
111 ->GetRootWindowForDisplayId(display_id); 111 ->GetRootWindowForDisplayId(display_id);
112 aura::Window* container = GetRootWindowController(root_window) 112 aura::Window* container = GetRootWindowController(root_window)
113 ->GetContainer(kShellWindowId_AppListContainer); 113 ->GetContainer(kShellWindowId_AppListContainer);
114 WmShelf* shelf = WmShelf::ForWindow(WmWindowAura::Get(container)); 114 WmShelf* shelf = WmShelf::ForWindow(WmWindowAura::Get(container));
115 AppListButton* applist_button = shelf->shelf_widget()->GetAppListButton(); 115 AppListButton* applist_button = shelf->shelf_widget()->GetAppListButton();
116 DCHECK(applist_button);
116 bool is_fullscreen = IsFullscreenAppListEnabled() && 117 bool is_fullscreen = IsFullscreenAppListEnabled() &&
117 WmShell::Get() 118 WmShell::Get()
118 ->maximize_mode_controller() 119 ->maximize_mode_controller()
119 ->IsMaximizeModeWindowManagerEnabled(); 120 ->IsMaximizeModeWindowManagerEnabled();
120 if (is_fullscreen) { 121 if (is_fullscreen) {
121 view->InitAsFramelessWindow( 122 view->InitAsFramelessWindow(
122 container, current_apps_page, 123 container, current_apps_page,
123 ScreenUtil::GetDisplayWorkAreaBoundsInParent(container)); 124 ScreenUtil::GetDisplayWorkAreaBoundsInParent(container));
124 } else { 125 } else {
125 view->InitAsBubble(container, current_apps_page); 126 view->InitAsBubble(container, current_apps_page);
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 } 278 }
278 279
279 //////////////////////////////////////////////////////////////////////////////// 280 ////////////////////////////////////////////////////////////////////////////////
280 // AppListPresenterDelegate, WmShelfObserver implementation: 281 // AppListPresenterDelegate, WmShelfObserver implementation:
281 282
282 void AppListPresenterDelegate::OnShelfIconPositionsChanged() { 283 void AppListPresenterDelegate::OnShelfIconPositionsChanged() {
283 UpdateBounds(); 284 UpdateBounds();
284 } 285 }
285 286
286 } // namespace ash 287 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/common/accelerators/accelerator_controller.cc » ('j') | ash/common/accelerators/accelerator_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698