chromeos: Move files in //ash/common to //ash, part 2

chrome/browser/ui/apps/chrome_app_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 23 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "extensions/common/constants.h"
 #include "printing/features/features.h"
 
 #if defined(USE_ASH)
-#include "ash/common/shelf/shelf_constants.h"  // nogncheck
+#include "ash/shelf/shelf_constants.h"  // nogncheck
 #endif
 
 #if BUILDFLAG(ENABLE_PRINTING)
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #else
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
 #endif  // BUILDFLAG(ENABLE_PRINTING)
@@ skipping 289 matching lines @@
                                         KeepAliveRestartOption::DISABLED));
 }
 
 void ChromeAppDelegate::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_APP_TERMINATING, type);
   if (!terminating_callback_.is_null())
     terminating_callback_.Run();
 }