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

Side by Side Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.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 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 "chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h" 5 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_win.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/shell.h" 8 #include "ash/shell.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "base/threading/sequenced_worker_pool.h" 12 #include "base/threading/sequenced_worker_pool.h"
13 #include "chrome/browser/apps/per_app_settings_service.h" 13 #include "chrome/browser/apps/per_app_settings_service.h"
14 #include "chrome/browser/apps/per_app_settings_service_factory.h" 14 #include "chrome/browser/apps/per_app_settings_service_factory.h"
15 #include "chrome/browser/metro_utils/metro_chrome_win.h" 15 #include "chrome/browser/metro_utils/metro_chrome_win.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/shell_integration.h" 17 #include "chrome/browser/shell_integration.h"
18 #include "chrome/browser/ui/host_desktop.h"
18 #include "chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win .h" 19 #include "chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win .h"
19 #include "chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h" 20 #include "chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h"
20 #include "chrome/browser/web_applications/web_app.h" 21 #include "chrome/browser/web_applications/web_app.h"
21 #include "chrome/browser/web_applications/web_app_win.h" 22 #include "chrome/browser/web_applications/web_app_win.h"
22 #include "chrome/common/chrome_icon_resources_win.h" 23 #include "chrome/common/chrome_icon_resources_win.h"
23 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
24 #include "chrome/grit/generated_resources.h" 25 #include "chrome/grit/generated_resources.h"
25 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
26 #include "extensions/browser/app_window/app_window.h" 27 #include "extensions/browser/app_window/app_window.h"
27 #include "extensions/browser/app_window/app_window_registry.h" 28 #include "extensions/browser/app_window/app_window_registry.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 ActivateParentDesktopIfNecessary(); 160 ActivateParentDesktopIfNecessary();
160 ChromeNativeAppWindowViewsAura::Activate(); 161 ChromeNativeAppWindowViewsAura::Activate();
161 } 162 }
162 163
163 bool ChromeNativeAppWindowViewsWin::CanMinimize() const { 164 bool ChromeNativeAppWindowViewsWin::CanMinimize() const {
164 // Resizing on Windows breaks translucency if the window also has shape. 165 // Resizing on Windows breaks translucency if the window also has shape.
165 // See http://crbug.com/417947. 166 // See http://crbug.com/417947.
166 return ChromeNativeAppWindowViewsAura::CanMinimize() && 167 return ChromeNativeAppWindowViewsAura::CanMinimize() &&
167 !(WidgetHasHitTestMask() && is_translucent_); 168 !(WidgetHasHitTestMask() && is_translucent_);
168 } 169 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc ('k') | chrome/browser/ui/views/auto_keep_alive.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698