| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/native_app_window_views_win.h" | 5 #include "chrome/browser/ui/views/apps/native_app_window_views_win.h" |
| 6 | 6 |
| 7 #include "apps/shell_window.h" | 7 #include "apps/shell_window.h" |
| 8 #include "apps/shell_window_registry.h" | 8 #include "apps/shell_window_registry.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "chrome/browser/metro_utils/metro_chrome_win.h" | 10 #include "chrome/browser/metro_utils/metro_chrome_win.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/common/extensions/extension.h" | 12 #include "extensions/common/extension.h" |
| 13 #include "ui/aura/remote_root_window_host_win.h" | 13 #include "ui/aura/remote_root_window_host_win.h" |
| 14 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 14 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 15 | 15 |
| 16 NativeAppWindowViewsWin::NativeAppWindowViewsWin( | 16 NativeAppWindowViewsWin::NativeAppWindowViewsWin( |
| 17 apps::ShellWindow* shell_window, | 17 apps::ShellWindow* shell_window, |
| 18 const apps::ShellWindow::CreateParams& params) | 18 const apps::ShellWindow::CreateParams& params) |
| 19 : NativeAppWindowViews(shell_window, params) {} | 19 : NativeAppWindowViews(shell_window, params) {} |
| 20 | 20 |
| 21 void NativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() { | 21 void NativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() { |
| 22 if (!ash::Shell::HasInstance()) | 22 if (!ash::Shell::HasInstance()) |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 | 61 |
| 62 void NativeAppWindowViewsWin::Show() { | 62 void NativeAppWindowViewsWin::Show() { |
| 63 ActivateParentDesktopIfNecessary(); | 63 ActivateParentDesktopIfNecessary(); |
| 64 NativeAppWindowViews::Show(); | 64 NativeAppWindowViews::Show(); |
| 65 } | 65 } |
| 66 | 66 |
| 67 void NativeAppWindowViewsWin::Activate() { | 67 void NativeAppWindowViewsWin::Activate() { |
| 68 ActivateParentDesktopIfNecessary(); | 68 ActivateParentDesktopIfNecessary(); |
| 69 NativeAppWindowViews::Activate(); | 69 NativeAppWindowViews::Activate(); |
| 70 } | 70 } |
| OLD | NEW |