chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc ('k') | chrome/browser/ui/views/chrome_views_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

index 7ba1bde20a00ec45000f0a3d2d27de051eeae070..78abdfe857a959e034e7ddf32fce57a32cc819c0 100644

--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

@@ -5,8 +5,9 @@

#include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h"

#include "apps/ui/views/app_window_frame_view.h"

-#include "ash/ash_constants.h"

-#include "ash/ash_switches.h"

+#include "ash/common/ash_constants.h"

+#include "ash/common/ash_switches.h"

+#include "ash/common/wm_window.h"

#include "ash/frame/custom_frame_view_ash.h"

#include "ash/public/cpp/shell_window_ids.h"

#include "ash/public/cpp/window_properties.h"

@@ -20,7 +21,6 @@

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_state_delegate.h"

#include "ash/wm/window_state_observer.h"

-#include "ash/wm_window.h"

#include "chrome/browser/chromeos/note_taking_helper.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/ash/ash_util.h"