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

Side by Side Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

Issue 2886293002: Remove WINDOW_TYPE_V1_PANEL AppWindow type (Closed)
Patch Set: remove unused includes 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
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 "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h " 5 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h "
6 6
7 #include "apps/ui/views/app_window_frame_view.h" 7 #include "apps/ui/views/app_window_frame_view.h"
8 #include "ash/ash_constants.h" 8 #include "ash/ash_constants.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/frame/custom_frame_view_ash.h" 10 #include "ash/frame/custom_frame_view_ash.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 int display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id(); 159 int display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
160 init_params 160 init_params
161 ->mus_properties[ui::mojom::WindowManager::kDisplayId_InitProperty] = 161 ->mus_properties[ui::mojom::WindowManager::kDisplayId_InitProperty] =
162 mojo::ConvertTo<std::vector<uint8_t>>(display_id); 162 mojo::ConvertTo<std::vector<uint8_t>>(display_id);
163 } else { 163 } else {
164 init_params->parent = ash::Shell::GetContainer( 164 init_params->parent = ash::Shell::GetContainer(
165 ash::Shell::GetPrimaryRootWindow(), container_id); 165 ash::Shell::GetPrimaryRootWindow(), container_id);
166 } 166 }
167 } 167 }
168 DCHECK_NE(AppWindow::WINDOW_TYPE_PANEL, create_params.window_type); 168 DCHECK_NE(AppWindow::WINDOW_TYPE_PANEL, create_params.window_type);
169 DCHECK_NE(AppWindow::WINDOW_TYPE_V1_PANEL, create_params.window_type);
170 init_params->mus_properties 169 init_params->mus_properties
171 [ui::mojom::WindowManager::kRemoveStandardFrame_InitProperty] = 170 [ui::mojom::WindowManager::kRemoveStandardFrame_InitProperty] =
172 mojo::ConvertTo<std::vector<uint8_t>>(init_params->remove_standard_frame); 171 mojo::ConvertTo<std::vector<uint8_t>>(init_params->remove_standard_frame);
173 } 172 }
174 173
175 void ChromeNativeAppWindowViewsAuraAsh::OnBeforePanelWidgetInit( 174 void ChromeNativeAppWindowViewsAuraAsh::OnBeforePanelWidgetInit(
176 views::Widget::InitParams* init_params, 175 views::Widget::InitParams* init_params,
177 views::Widget* widget) { 176 views::Widget* widget) {
178 ChromeNativeAppWindowViewsAura::OnBeforePanelWidgetInit(init_params, 177 ChromeNativeAppWindowViewsAura::OnBeforePanelWidgetInit(init_params,
179 widget); 178 widget);
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 bool activate_on_pointer) { 376 bool activate_on_pointer) {
378 widget()->GetNativeWindow()->SetProperty(aura::client::kActivateOnPointerKey, 377 widget()->GetNativeWindow()->SetProperty(aura::client::kActivateOnPointerKey,
379 activate_on_pointer); 378 activate_on_pointer);
380 } 379 }
381 380
382 void ChromeNativeAppWindowViewsAuraAsh::OnMenuClosed() { 381 void ChromeNativeAppWindowViewsAuraAsh::OnMenuClosed() {
383 menu_runner_.reset(); 382 menu_runner_.reset();
384 menu_model_adapter_.reset(); 383 menu_model_adapter_.reset();
385 menu_model_.reset(); 384 menu_model_.reset();
386 } 385 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/apps/chrome_native_app_window_views.cc ('k') | extensions/browser/app_window/app_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698