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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Issue 22355002: Revert 215753 "Move native_app_window code to apps areas" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 | « trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc ('k') | trunk/src/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc (revision 215780)
+++ trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc (working copy)
@@ -4,7 +4,6 @@
#include "chrome/browser/ui/ash/chrome_shell_delegate.h"
-#include "apps/native_app_window.h"
#include "ash/keyboard_overlay/keyboard_overlay_view.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
@@ -30,6 +29,7 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/extensions/application_launch.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
« no previous file with comments | « trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc ('k') | trunk/src/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698