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

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

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 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 "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h" 5 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.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/frame/custom_frame_view_ash.h" 9 #include "ash/frame/custom_frame_view_ash.h"
10 #include "ash/screen_util.h" 10 #include "ash/screen_util.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/wm/immersive_fullscreen_controller.h" 12 #include "ash/wm/immersive_fullscreen_controller.h"
13 #include "ash/wm/panels/panel_frame_view.h" 13 #include "ash/wm/panels/panel_frame_view.h"
14 #include "ash/wm/window_properties.h" 14 #include "ash/wm/window_properties.h"
15 #include "ash/wm/window_state.h" 15 #include "ash/wm/window_state.h"
16 #include "ash/wm/window_state_delegate.h" 16 #include "ash/wm/window_state_delegate.h"
17 #include "ash/wm/window_state_observer.h" 17 #include "ash/wm/window_state_observer.h"
18 #include "chrome/browser/ui/ash/ash_util.h" 18 #include "chrome/browser/ui/ash/ash_util.h"
19 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" 19 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h"
20 #include "chrome/browser/ui/host_desktop.h" 20 #include "chrome/browser/ui/host_desktop.h"
21 #include "chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.h" 21 #include "chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.h"
22 #include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h" 22 #include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h"
23 #include "chrome/browser/web_applications/web_app.h" 23 #include "chrome/browser/web_applications/web_app.h"
24 #include "ui/aura/client/aura_constants.h" 24 #include "ui/aura/client/aura_constants.h"
25 #include "ui/aura/window.h" 25 #include "ui/aura/window.h"
26 #include "ui/aura/window_observer.h" 26 #include "ui/aura/window_observer.h"
27 #include "ui/base/hit_test.h" 27 #include "ui/base/hit_test.h"
28 #include "ui/base/models/simple_menu_model.h" 28 #include "ui/base/models/simple_menu_model.h"
29 #include "ui/gfx/host_desktop_type.h"
29 #include "ui/gfx/image/image_skia.h" 30 #include "ui/gfx/image/image_skia.h"
30 #include "ui/views/controls/menu/menu_runner.h" 31 #include "ui/views/controls/menu/menu_runner.h"
31 #include "ui/views/widget/widget.h" 32 #include "ui/views/widget/widget.h"
32 33
33 #if defined(OS_CHROMEOS) 34 #if defined(OS_CHROMEOS)
34 #include "ash/shell_window_ids.h" 35 #include "ash/shell_window_ids.h"
35 #endif 36 #endif
36 37
37 #if defined(OS_LINUX) 38 #if defined(OS_LINUX)
38 #include "chrome/browser/shell_integration_linux.h" 39 #include "chrome/browser/shell_integration_linux.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 ChromeNativeAppWindowViews::UpdateShape(region.Pass()); 378 ChromeNativeAppWindowViews::UpdateShape(region.Pass());
378 379
379 aura::Window* native_window = widget()->GetNativeWindow(); 380 aura::Window* native_window = widget()->GetNativeWindow();
380 if (shape() && !had_shape) { 381 if (shape() && !had_shape) {
381 native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>( 382 native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
382 new ShapedAppWindowTargeter(native_window, this))); 383 new ShapedAppWindowTargeter(native_window, this)));
383 } else if (!shape() && had_shape) { 384 } else if (!shape() && had_shape) {
384 native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>()); 385 native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>());
385 } 386 }
386 } 387 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698