refactor: replace includes for atom with shell

shell/browser/ui/accelerator_util.cc

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/accelerator_util.h"
+#include "shell/browser/ui/accelerator_util.h"
 
 #include <stdio.h>
 
 #include <string>
 #include <vector>
 
-#include "atom/common/keyboard_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "shell/common/keyboard_util.h"
 
 namespace accelerator_util {
 

shell/browser/ui/accelerator_util.h

@@ -8,7 +8,7 @@
 #include <map>
 #include <string>
 
-#include "atom/browser/ui/atom_menu_model.h"
+#include "shell/browser/ui/atom_menu_model.h"
 #include "ui/base/accelerators/accelerator.h"
 
 namespace accelerator_util {

shell/browser/ui/atom_menu_model.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/atom_menu_model.h"
+#include "shell/browser/ui/atom_menu_model.h"
 
 #include "base/stl_util.h"
 

shell/browser/ui/autofill_popup.cc

@@ -6,12 +6,12 @@
 #include <utility>
 #include <vector>
 
-#include "atom/browser/native_window_views.h"
-#include "atom/browser/ui/autofill_popup.h"
-#include "atom/common/api/api.mojom.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/ui/autofill/popup_view_common.h"
 #include "electron/buildflags/buildflags.h"
+#include "shell/browser/native_window_views.h"
+#include "shell/browser/ui/autofill_popup.h"
+#include "shell/common/api/api.mojom.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
@@ -22,8 +22,8 @@
 #include "ui/gfx/text_utils.h"
 
 #if BUILDFLAG(ENABLE_OSR)
-#include "atom/browser/osr/osr_render_widget_host_view.h"
-#include "atom/browser/osr/osr_view_proxy.h"
+#include "shell/browser/osr/osr_render_widget_host_view.h"
+#include "shell/browser/osr/osr_view_proxy.h"
 #endif
 
 namespace atom {

shell/browser/ui/autofill_popup.h

@@ -7,8 +7,8 @@
 
 #include <vector>
 
-#include "atom/browser/ui/views/autofill_popup_view.h"
 #include "content/public/browser/render_frame_host.h"
+#include "shell/browser/ui/views/autofill_popup_view.h"
 #include "ui/gfx/font_list.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/view.h"

shell/browser/ui/certificate_trust.h

@@ -7,9 +7,9 @@
 
 #include <string>
 
-#include "atom/common/promise_util.h"
 #include "base/memory/ref_counted.h"
 #include "net/cert/x509_certificate.h"
+#include "shell/common/promise_util.h"
 
 namespace atom {
 class NativeWindow;

shell/browser/ui/certificate_trust_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/certificate_trust.h"
+#include "shell/browser/ui/certificate_trust.h"
 
 #include <memory>
 #include <string>
@@ -11,11 +11,11 @@
 #import <Cocoa/Cocoa.h>
 #import <SecurityInterface/SFCertificateTrustPanel.h>
 
-#include "atom/browser/native_window.h"
 #include "base/strings/sys_string_conversions.h"
 #include "net/cert/cert_database.h"
 #include "net/cert/x509_util_ios_and_mac.h"
 #include "net/cert/x509_util_mac.h"
+#include "shell/browser/native_window.h"
 
 @interface TrustDelegate : NSObject {
  @private

shell/browser/ui/certificate_trust_win.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/certificate_trust.h"
+#include "shell/browser/ui/certificate_trust.h"
 
 #include <windows.h>  // windows.h must be included first
 

shell/browser/ui/cocoa/NSColor+Hex.mm

@@ -4,7 +4,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/cocoa/NSColor+Hex.h"
+#include "shell/browser/ui/cocoa/NSColor+Hex.h"
 
 @implementation NSColor (Hex)
 

shell/browser/ui/cocoa/NSString+ANSI.mm

@@ -4,9 +4,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/cocoa/NSColor+Hex.h"
-#include "atom/browser/ui/cocoa/NSString+ANSI.h"
 #include "base/mac/scoped_nsobject.h"
+#include "shell/browser/ui/cocoa/NSColor+Hex.h"
+#include "shell/browser/ui/cocoa/NSString+ANSI.h"
 
 @implementation NSMutableDictionary (ANSI)
 

shell/browser/ui/cocoa/atom_bundle_mover.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#import "atom/browser/ui/cocoa/atom_bundle_mover.h"
+#import "shell/browser/ui/cocoa/atom_bundle_mover.h"
 
 #include <string>
 
@@ -13,7 +13,7 @@
 #import <sys/mount.h>
 #import <sys/param.h>
 
-#import "atom/browser/browser.h"
+#import "shell/browser/browser.h"
 
 namespace atom {
 

shell/browser/ui/cocoa/atom_inspectable_web_contents_view.mm

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "atom/browser/ui/cocoa/atom_inspectable_web_contents_view.h"
+#include "shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h"
 
-#include "atom/browser/ui/cocoa/event_dispatching_window.h"
-#include "atom/browser/ui/inspectable_web_contents_impl.h"
-#include "atom/browser/ui/inspectable_web_contents_view_delegate.h"
-#include "atom/browser/ui/inspectable_web_contents_view_mac.h"
 #include "content/public/browser/render_widget_host_view.h"
+#include "shell/browser/ui/cocoa/event_dispatching_window.h"
+#include "shell/browser/ui/inspectable_web_contents_impl.h"
+#include "shell/browser/ui/inspectable_web_contents_view_delegate.h"
+#include "shell/browser/ui/inspectable_web_contents_view_mac.h"
 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"
 
 @implementation AtomInspectableWebContentsView

shell/browser/ui/cocoa/atom_menu_controller.mm

@@ -3,16 +3,16 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#import "atom/browser/ui/cocoa/atom_menu_controller.h"
+#import "shell/browser/ui/cocoa/atom_menu_controller.h"
 
-#include "atom/browser/mac/atom_application.h"
-#include "atom/browser/ui/atom_menu_model.h"
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "shell/browser/mac/atom_application.h"
+#include "shell/browser/ui/atom_menu_model.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/platform_accelerator_cocoa.h"
 #include "ui/base/l10n/l10n_util_mac.h"

shell/browser/ui/cocoa/atom_native_widget_mac.mm

@@ -2,9 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/cocoa/atom_native_widget_mac.h"
+#include "shell/browser/ui/cocoa/atom_native_widget_mac.h"
 
-#include "atom/browser/ui/cocoa/atom_ns_window.h"
+#include "shell/browser/ui/cocoa/atom_ns_window.h"
 
 namespace atom {
 

shell/browser/ui/cocoa/atom_ns_window.h

@@ -5,8 +5,8 @@
 #ifndef ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_
 #define ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_
 
-#include "atom/browser/ui/cocoa/event_dispatching_window.h"
 #include "components/remote_cocoa/app_shim/native_widget_mac_nswindow.h"
+#include "shell/browser/ui/cocoa/event_dispatching_window.h"
 #include "ui/views/widget/native_widget_mac.h"
 
 namespace atom {

shell/browser/ui/cocoa/atom_ns_window.mm

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/cocoa/atom_ns_window.h"
+#include "shell/browser/ui/cocoa/atom_ns_window.h"
 
-#include "atom/browser/native_window_mac.h"
-#include "atom/browser/ui/cocoa/atom_preview_item.h"
-#include "atom/browser/ui/cocoa/atom_touch_bar.h"
-#include "atom/browser/ui/cocoa/root_view_mac.h"
 #include "base/strings/sys_string_conversions.h"
+#include "shell/browser/native_window_mac.h"
+#include "shell/browser/ui/cocoa/atom_preview_item.h"
+#include "shell/browser/ui/cocoa/atom_touch_bar.h"
+#include "shell/browser/ui/cocoa/root_view_mac.h"
 #include "ui/base/cocoa/window_size_constants.h"
 
 namespace atom {

shell/browser/ui/cocoa/atom_ns_window_delegate.mm

@@ -2,16 +2,16 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/cocoa/atom_ns_window_delegate.h"
+#include "shell/browser/ui/cocoa/atom_ns_window_delegate.h"
 
 #include <algorithm>
 
-#include "atom/browser/browser.h"
-#include "atom/browser/native_window_mac.h"
-#include "atom/browser/ui/cocoa/atom_preview_item.h"
-#include "atom/browser/ui/cocoa/atom_touch_bar.h"
 #include "base/mac/mac_util.h"
 #include "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h"
+#include "shell/browser/browser.h"
+#include "shell/browser/native_window_mac.h"
+#include "shell/browser/ui/cocoa/atom_preview_item.h"
+#include "shell/browser/ui/cocoa/atom_touch_bar.h"
 #include "ui/views/cocoa/native_widget_mac_ns_window_host.h"
 #include "ui/views/widget/native_widget_mac.h"
 

shell/browser/ui/cocoa/atom_preview_item.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/cocoa/atom_preview_item.h"
+#include "shell/browser/ui/cocoa/atom_preview_item.h"
 
 @implementation AtomPreviewItem
 

shell/browser/ui/cocoa/atom_touch_bar.h

@@ -11,11 +11,11 @@
 #include <string>
 #include <vector>
 
-#include "atom/browser/native_window.h"
-#include "atom/browser/ui/cocoa/touch_bar_forward_declarations.h"
 #include "base/mac/scoped_nsobject.h"
 #include "native_mate/constructor.h"
 #include "native_mate/persistent_dictionary.h"
+#include "shell/browser/native_window.h"
+#include "shell/browser/ui/cocoa/touch_bar_forward_declarations.h"
 
 @interface AtomTouchBar : NSObject <NSScrubberDelegate,
                                     NSScrubberDataSource,

shell/browser/ui/cocoa/atom_touch_bar.mm

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#import "atom/browser/ui/cocoa/atom_touch_bar.h"
+#import "shell/browser/ui/cocoa/atom_touch_bar.h"
 
 #include <string>
 #include <vector>
 
-#include "atom/common/color_util.h"
-#include "atom/common/native_mate_converters/image_converter.h"
 #include "base/strings/sys_string_conversions.h"
+#include "shell/common/color_util.h"
+#include "shell/common/native_mate_converters/image_converter.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/gfx/image/image.h"
 

shell/browser/ui/cocoa/delayed_native_view_host.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/cocoa/delayed_native_view_host.h"
+#include "shell/browser/ui/cocoa/delayed_native_view_host.h"
 
 namespace atom {
 

shell/browser/ui/cocoa/event_dispatching_window.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/cocoa/event_dispatching_window.h"
+#include "shell/browser/ui/cocoa/event_dispatching_window.h"
 
 @implementation EventDispatchingWindow
 

shell/browser/ui/cocoa/root_view_mac.mm

@@ -2,9 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/cocoa/root_view_mac.h"
+#include "shell/browser/ui/cocoa/root_view_mac.h"
 
-#include "atom/browser/native_window.h"
+#include "shell/browser/native_window.h"
 
 namespace atom {
 

shell/browser/ui/cocoa/views_delegate_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/cocoa/views_delegate_mac.h"
+#include "shell/browser/ui/cocoa/views_delegate_mac.h"
 
 #include "content/public/browser/context_factory.h"
 #include "ui/views/widget/native_widget_mac.h"

shell/browser/ui/devtools_manager_delegate.cc

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "atom/browser/ui/devtools_manager_delegate.h"
+#include "shell/browser/ui/devtools_manager_delegate.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
-#include "atom/browser/atom_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ -28,6 +27,7 @@
 #include "net/base/net_errors.h"
 #include "net/socket/stream_socket.h"
 #include "net/socket/tcp_server_socket.h"
+#include "shell/browser/atom_paths.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace atom {

shell/browser/ui/devtools_ui.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "atom/browser/ui/devtools_ui.h"
+#include "shell/browser/ui/devtools_ui.h"
 
 #include <memory>
 #include <string>

shell/browser/ui/drag_util_mac.mm

@@ -6,9 +6,9 @@
 
 #include <vector>
 
-#include "atom/browser/ui/drag_util.h"
 #include "base/files/file_path.h"
 #include "base/strings/sys_string_conversions.h"
+#include "shell/browser/ui/drag_util.h"
 
 namespace atom {
 

shell/browser/ui/drag_util_views.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/drag_util.h"
+#include "shell/browser/ui/drag_util.h"
 
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/window.h"

shell/browser/ui/file_dialog.h

@@ -9,10 +9,10 @@
 #include <utility>
 #include <vector>
 
-#include "atom/common/native_mate_converters/file_path_converter.h"
-#include "atom/common/promise_util.h"
 #include "base/files/file_path.h"
 #include "native_mate/dictionary.h"
+#include "shell/common/native_mate_converters/file_path_converter.h"
+#include "shell/common/promise_util.h"
 
 namespace atom {
 class NativeWindow;

shell/browser/ui/file_dialog_gtk.cc

@@ -2,16 +2,16 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/file_dialog.h"
+#include "shell/browser/ui/file_dialog.h"
 
 #include <glib/gi18n.h>  // _() macro
 
-#include "atom/browser/native_window_views.h"
-#include "atom/browser/unresponsive_suppressor.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/ui/libgtkui/gtk_util.h"
+#include "shell/browser/native_window_views.h"
+#include "shell/browser/unresponsive_suppressor.h"
 #include "ui/base/glib/glib_signal.h"
 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 

shell/browser/ui/file_dialog_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/file_dialog.h"
+#include "shell/browser/ui/file_dialog.h"
 
 #include <string>
 #include <utility>
@@ -11,12 +11,12 @@
 #import <Cocoa/Cocoa.h>
 #import <CoreServices/CoreServices.h>
 
-#include "atom/browser/native_window.h"
 #include "base/files/file_util.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
+#include "shell/browser/native_window.h"
 
 @interface PopUpButtonHandler : NSObject
 

shell/browser/ui/file_dialog_win.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/file_dialog.h"
+#include "shell/browser/ui/file_dialog.h"
 
 #include <windows.h>  // windows.h must be included first
 
@@ -11,8 +11,6 @@
 #include <shlobj.h>
 #include <shobjidl.h>
 
-#include "atom/browser/native_window_views.h"
-#include "atom/browser/unresponsive_suppressor.h"
 #include "base/files/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/strings/string_split.h"
@@ -21,6 +19,8 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/win/registry.h"
+#include "shell/browser/native_window_views.h"
+#include "shell/browser/unresponsive_suppressor.h"
 
 namespace file_dialog {
 

shell/browser/ui/inspectable_web_contents.cc

@@ -3,9 +3,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "atom/browser/ui/inspectable_web_contents.h"
+#include "shell/browser/ui/inspectable_web_contents.h"
 
-#include "atom/browser/ui/inspectable_web_contents_impl.h"
+#include "shell/browser/ui/inspectable_web_contents_impl.h"
 
 namespace atom {
 

shell/browser/ui/inspectable_web_contents_impl.cc

@@ -3,15 +3,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "atom/browser/ui/inspectable_web_contents_impl.h"
+#include "shell/browser/ui/inspectable_web_contents_impl.h"
 
 #include <memory>
 #include <utility>
 
-#include "atom/browser/ui/inspectable_web_contents_delegate.h"
-#include "atom/browser/ui/inspectable_web_contents_view.h"
-#include "atom/browser/ui/inspectable_web_contents_view_delegate.h"
-#include "atom/common/platform_util.h"
 #include "base/base64.h"
 #include "base/guid.h"
 #include "base/json/json_reader.h"
@@ -41,6 +37,10 @@
 #include "net/http/http_response_headers.h"
 #include "services/network/public/cpp/simple_url_loader.h"
 #include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
+#include "shell/browser/ui/inspectable_web_contents_delegate.h"
+#include "shell/browser/ui/inspectable_web_contents_view.h"
+#include "shell/browser/ui/inspectable_web_contents_view_delegate.h"
+#include "shell/common/platform_util.h"
 #include "third_party/blink/public/common/logging/logging_utils.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"

shell/browser/ui/inspectable_web_contents_impl.h

@@ -13,7 +13,6 @@
 #include <string>
 #include <vector>
 
-#include "atom/browser/ui/inspectable_web_contents.h"
 #include "base/containers/unique_ptr_adapters.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
@@ -22,6 +21,7 @@
 #include "content/public/browser/devtools_frontend_host.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "shell/browser/ui/inspectable_web_contents.h"
 #include "ui/gfx/geometry/rect.h"
 
 class PrefService;

shell/browser/ui/inspectable_web_contents_view_delegate.cc

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "atom/browser/ui/inspectable_web_contents_view_delegate.h"
+#include "shell/browser/ui/inspectable_web_contents_view_delegate.h"
 
 namespace atom {
 

shell/browser/ui/inspectable_web_contents_view_mac.h

@@ -6,7 +6,7 @@
 #ifndef ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_
 #define ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_
 
-#include "atom/browser/ui/inspectable_web_contents_view.h"
+#include "shell/browser/ui/inspectable_web_contents_view.h"
 
 #include "base/mac/scoped_nsobject.h"
 

shell/browser/ui/inspectable_web_contents_view_mac.mm

@@ -3,14 +3,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "atom/browser/ui/inspectable_web_contents_view_mac.h"
+#include "shell/browser/ui/inspectable_web_contents_view_mac.h"
 
 #import <AppKit/AppKit.h>
 
-#import "atom/browser/ui/cocoa/atom_inspectable_web_contents_view.h"
-#include "atom/browser/ui/inspectable_web_contents.h"
-#include "atom/browser/ui/inspectable_web_contents_view_delegate.h"
 #include "base/strings/sys_string_conversions.h"
+#import "shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h"
+#include "shell/browser/ui/inspectable_web_contents.h"
+#include "shell/browser/ui/inspectable_web_contents_view_delegate.h"
 
 namespace atom {
 

shell/browser/ui/message_box_gtk.cc

@@ -2,19 +2,19 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/message_box.h"
+#include "shell/browser/ui/message_box.h"
 
 #include <glib/gi18n.h>
 
-#include "atom/browser/browser.h"
-#include "atom/browser/native_window_observer.h"
-#include "atom/browser/native_window_views.h"
-#include "atom/browser/unresponsive_suppressor.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/libgtkui/gtk_util.h"
 #include "chrome/browser/ui/libgtkui/skia_utils_gtk.h"
+#include "shell/browser/browser.h"
+#include "shell/browser/native_window_observer.h"
+#include "shell/browser/native_window_views.h"
+#include "shell/browser/unresponsive_suppressor.h"
 #include "ui/base/glib/glib_signal.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"

shell/browser/ui/message_box_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/message_box.h"
+#include "shell/browser/ui/message_box.h"
 
 #include <string>
 #include <utility>
@@ -10,10 +10,10 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "atom/browser/native_window.h"
 #include "base/callback.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
+#include "shell/browser/native_window.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/gfx/image/image_skia.h"
 

shell/browser/ui/message_box_win.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/message_box.h"
+#include "shell/browser/ui/message_box.h"
 
 #include <windows.h>  // windows.h must be included first
 
@@ -11,9 +11,6 @@
 #include <map>
 #include <vector>
 
-#include "atom/browser/browser.h"
-#include "atom/browser/native_window_views.h"
-#include "atom/browser/unresponsive_suppressor.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
@@ -21,6 +18,9 @@
 #include "base/win/scoped_gdi_object.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "shell/browser/browser.h"
+#include "shell/browser/native_window_views.h"
+#include "shell/browser/unresponsive_suppressor.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image_skia.h"
 

shell/browser/ui/tray_icon.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/tray_icon.h"
+#include "shell/browser/ui/tray_icon.h"
 
 namespace atom {
 

shell/browser/ui/tray_icon.h

@@ -8,9 +8,9 @@
 #include <string>
 #include <vector>
 
-#include "atom/browser/ui/atom_menu_model.h"
-#include "atom/browser/ui/tray_icon_observer.h"
 #include "base/observer_list.h"
+#include "shell/browser/ui/atom_menu_model.h"
+#include "shell/browser/ui/tray_icon_observer.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace atom {

shell/browser/ui/tray_icon_cocoa.h

@@ -9,8 +9,8 @@
 
 #include <string>
 
-#include "atom/browser/ui/tray_icon.h"
 #include "base/mac/scoped_nsobject.h"
+#include "shell/browser/ui/tray_icon.h"
 
 @class AtomMenuController;
 @class StatusItemView;

shell/browser/ui/tray_icon_cocoa.mm

@@ -2,16 +2,16 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/tray_icon_cocoa.h"
+#include "shell/browser/ui/tray_icon_cocoa.h"
 
 #include <string>
 #include <vector>
 
-#include "atom/browser/mac/atom_application.h"
-#include "atom/browser/ui/cocoa/NSString+ANSI.h"
-#include "atom/browser/ui/cocoa/atom_menu_controller.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
+#include "shell/browser/mac/atom_application.h"
+#include "shell/browser/ui/cocoa/NSString+ANSI.h"
+#include "shell/browser/ui/cocoa/atom_menu_controller.h"
 #include "ui/display/screen.h"
 #include "ui/events/cocoa/cocoa_event_utils.h"
 #include "ui/gfx/image/image.h"

shell/browser/ui/tray_icon_gtk.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/tray_icon_gtk.h"
+#include "shell/browser/ui/tray_icon_gtk.h"
 
-#include "atom/browser/browser.h"
-#include "atom/common/application_info.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "shell/browser/browser.h"
+#include "shell/common/application_info.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/linux_ui/linux_ui.h"
 

shell/browser/ui/tray_icon_gtk.h

@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include "atom/browser/ui/tray_icon.h"
+#include "shell/browser/ui/tray_icon.h"
 #include "ui/views/linux_ui/status_icon_linux.h"
 
 namespace views {

shell/browser/ui/tray_icon_win.cc

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/win/notify_icon.h"
-#include "atom/browser/ui/win/notify_icon_host.h"
+#include "shell/browser/ui/win/notify_icon.h"
+#include "shell/browser/ui/win/notify_icon_host.h"
 
 namespace atom {
 

shell/browser/ui/views/atom_views_delegate.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "atom/browser/ui/views/atom_views_delegate.h"
+#include "shell/browser/ui/views/atom_views_delegate.h"
 
 #include <memory>
 

shell/browser/ui/views/autofill_popup_view.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/views/autofill_popup_view.h"
+#include "shell/browser/ui/views/autofill_popup_view.h"
 
 #include <memory>
 

shell/browser/ui/views/autofill_popup_view.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "atom/browser/ui/autofill_popup.h"
+#include "shell/browser/ui/autofill_popup.h"
 
 #include "base/optional.h"
 #include "content/public/browser/native_web_keyboard_event.h"
@@ -20,7 +20,7 @@
 #include "ui/views/widget/widget_observer.h"
 
 #if BUILDFLAG(ENABLE_OSR)
-#include "atom/browser/osr/osr_view_proxy.h"
+#include "shell/browser/osr/osr_view_proxy.h"
 #endif
 
 namespace atom {

shell/browser/ui/views/frameless_view.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/views/frameless_view.h"
+#include "shell/browser/ui/views/frameless_view.h"
 
-#include "atom/browser/native_window_views.h"
+#include "shell/browser/native_window_views.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/widget.h"

shell/browser/ui/views/global_menu_bar_x11.cc

@@ -2,17 +2,17 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/views/global_menu_bar_x11.h"
+#include "shell/browser/ui/views/global_menu_bar_x11.h"
 
 #include <dlfcn.h>
 #include <glib-object.h>
 
-#include "atom/browser/native_window_views.h"
-#include "atom/browser/ui/atom_menu_model.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
+#include "shell/browser/native_window_views.h"
+#include "shell/browser/ui/atom_menu_model.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/accelerators/menu_label_accelerator_util_linux.h"

shell/browser/ui/views/global_menu_bar_x11.h

@@ -7,9 +7,9 @@
 
 #include <string>
 
-#include "atom/browser/ui/atom_menu_model.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "shell/browser/ui/atom_menu_model.h"
 #include "ui/base/glib/glib_signal.h"
 #include "ui/gfx/native_widget_types.h"
 

shell/browser/ui/views/inspectable_web_contents_view_views.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#include "atom/browser/ui/views/inspectable_web_contents_view_views.h"
+#include "shell/browser/ui/views/inspectable_web_contents_view_views.h"
 
-#include "atom/browser/ui/inspectable_web_contents_delegate.h"
-#include "atom/browser/ui/inspectable_web_contents_impl.h"
-#include "atom/browser/ui/inspectable_web_contents_view_delegate.h"
 #include "base/strings/utf_string_conversions.h"
+#include "shell/browser/ui/inspectable_web_contents_delegate.h"
+#include "shell/browser/ui/inspectable_web_contents_impl.h"
+#include "shell/browser/ui/inspectable_web_contents_view_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"

shell/browser/ui/views/inspectable_web_contents_view_views.h

@@ -7,9 +7,9 @@
 
 #include <memory>
 
-#include "atom/browser/ui/inspectable_web_contents_view.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
+#include "shell/browser/ui/inspectable_web_contents_view.h"
 #include "ui/views/view.h"
 
 namespace views {

shell/browser/ui/views/menu_bar.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/views/menu_bar.h"
+#include "shell/browser/ui/views/menu_bar.h"
 
 #include <memory>
 #include <set>
 #include <sstream>
 
-#include "atom/browser/ui/views/submenu_button.h"
-#include "atom/common/keyboard_util.h"
+#include "shell/browser/ui/views/submenu_button.h"
+#include "shell/common/keyboard_util.h"
 #include "ui/aura/window.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/views/background.h"

shell/browser/ui/views/menu_bar.h

@@ -7,9 +7,9 @@
 
 #include <memory>
 
-#include "atom/browser/ui/atom_menu_model.h"
-#include "atom/browser/ui/views/menu_delegate.h"
-#include "atom/browser/ui/views/root_view.h"
+#include "shell/browser/ui/atom_menu_model.h"
+#include "shell/browser/ui/views/menu_delegate.h"
+#include "shell/browser/ui/views/root_view.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/focus/focus_manager.h"

shell/browser/ui/views/menu_delegate.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/views/menu_delegate.h"
+#include "shell/browser/ui/views/menu_delegate.h"
 
-#include "atom/browser/ui/views/menu_bar.h"
-#include "atom/browser/ui/views/menu_model_adapter.h"
 #include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "shell/browser/ui/views/menu_bar.h"
+#include "shell/browser/ui/views/menu_model_adapter.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"

shell/browser/ui/views/menu_delegate.h

@@ -7,8 +7,8 @@
 
 #include <memory>
 
-#include "atom/browser/ui/atom_menu_model.h"
 #include "base/observer_list.h"
+#include "shell/browser/ui/atom_menu_model.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 
 namespace views {

shell/browser/ui/views/menu_model_adapter.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/views/menu_model_adapter.h"
+#include "shell/browser/ui/views/menu_model_adapter.h"
 
 namespace atom {
 

shell/browser/ui/views/menu_model_adapter.h

@@ -5,7 +5,7 @@
 #ifndef ATOM_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_
 #define ATOM_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_
 
-#include "atom/browser/ui/atom_menu_model.h"
+#include "shell/browser/ui/atom_menu_model.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 
 namespace atom {

shell/browser/ui/views/native_frame_view.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/views/native_frame_view.h"
+#include "shell/browser/ui/views/native_frame_view.h"
 
-#include "atom/browser/native_window.h"
+#include "shell/browser/native_window.h"
 
 namespace atom {
 

shell/browser/ui/views/root_view.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/views/root_view.h"
+#include "shell/browser/ui/views/root_view.h"
 
-#include "atom/browser/native_window.h"
-#include "atom/browser/ui/views/menu_bar.h"
 #include "content/public/browser/native_web_keyboard_event.h"
+#include "shell/browser/native_window.h"
+#include "shell/browser/ui/views/menu_bar.h"
 
 namespace atom {
 

shell/browser/ui/views/root_view.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "atom/browser/ui/accelerator_util.h"
+#include "shell/browser/ui/accelerator_util.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/view.h"
 #include "ui/views/view_tracker.h"

shell/browser/ui/views/submenu_button.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/views/submenu_button.h"
+#include "shell/browser/ui/views/submenu_button.h"
 
 #include <memory>
 #include <utility>

shell/browser/ui/views/win_frame_view.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/views/win_frame_view.h"
+#include "shell/browser/ui/views/win_frame_view.h"
 
-#include "atom/browser/native_window_views.h"
+#include "shell/browser/native_window_views.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/win/hwnd_util.h"
 

shell/browser/ui/views/win_frame_view.h

@@ -5,7 +5,7 @@
 #ifndef ATOM_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
 #define ATOM_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
 
-#include "atom/browser/ui/views/frameless_view.h"
+#include "shell/browser/ui/views/frameless_view.h"
 
 namespace atom {
 

shell/browser/ui/webui/pdf_viewer_handler.cc

@@ -2,12 +2,11 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/webui/pdf_viewer_handler.h"
+#include "shell/browser/ui/webui/pdf_viewer_handler.h"
 
 #include <memory>
 #include <utility>
 
-#include "atom/common/atom_constants.h"
 #include "base/bind.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ -18,6 +17,7 @@
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/url_constants.h"
 #include "net/http/http_response_headers.h"
+#include "shell/common/atom_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 

shell/browser/ui/webui/pdf_viewer_handler.h

@@ -8,10 +8,10 @@
 #include <memory>
 #include <string>
 
-#include "atom/browser/web_contents_zoom_controller.h"
 #include "base/macros.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/web_ui_message_handler.h"
+#include "shell/browser/web_contents_zoom_controller.h"
 
 namespace base {
 class ListValue;

shell/browser/ui/webui/pdf_viewer_ui.cc

@@ -2,16 +2,12 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/webui/pdf_viewer_ui.h"
+#include "shell/browser/ui/webui/pdf_viewer_ui.h"
 
 #include <map>
 #include <memory>
 #include <utility>
 
-#include "atom/browser/atom_browser_context.h"
-#include "atom/browser/loader/layered_resource_handler.h"
-#include "atom/browser/ui/webui/pdf_viewer_handler.h"
-#include "atom/common/atom_constants.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/task/post_task.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
@@ -36,6 +32,10 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "services/network/public/cpp/resource_response.h"
+#include "shell/browser/atom_browser_context.h"
+#include "shell/browser/loader/layered_resource_handler.h"
+#include "shell/browser/ui/webui/pdf_viewer_handler.h"
+#include "shell/common/atom_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;

shell/browser/ui/win/atom_desktop_native_widget_aura.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/win/atom_desktop_native_widget_aura.h"
+#include "shell/browser/ui/win/atom_desktop_native_widget_aura.h"
 
-#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
+#include "shell/browser/ui/win/atom_desktop_window_tree_host_win.h"
 #include "ui/views/corewm/tooltip_controller.h"
 #include "ui/wm/public/tooltip_client.h"
 

shell/browser/ui/win/atom_desktop_native_widget_aura.h

@@ -5,7 +5,7 @@
 #ifndef ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_
 #define ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_
 
-#include "atom/browser/native_window_views.h"
+#include "shell/browser/native_window_views.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 namespace views {

shell/browser/ui/win/atom_desktop_window_tree_host_win.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
+#include "shell/browser/ui/win/atom_desktop_window_tree_host_win.h"
 
 namespace atom {
 

shell/browser/ui/win/atom_desktop_window_tree_host_win.h

@@ -7,7 +7,7 @@
 
 #include <windows.h>
 
-#include "atom/browser/native_window_views.h"
+#include "shell/browser/native_window_views.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
 
 namespace atom {

shell/browser/ui/win/jump_list.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/win/jump_list.h"
+#include "shell/browser/ui/win/jump_list.h"
 
 #include <propkey.h>  // for PKEY_* constants
 

shell/browser/ui/win/notify_icon.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/win/notify_icon.h"
+#include "shell/browser/ui/win/notify_icon.h"
 
-#include "atom/browser/ui/win/notify_icon_host.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
+#include "shell/browser/ui/win/notify_icon_host.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/display/screen.h"
 #include "ui/display/win/screen_win.h"

shell/browser/ui/win/notify_icon.h

@@ -12,11 +12,11 @@
 #include <memory>
 #include <string>
 
-#include "atom/browser/ui/tray_icon.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/win/scoped_gdi_object.h"
+#include "shell/browser/ui/tray_icon.h"
 
 namespace gfx {
 class Point;

shell/browser/ui/win/notify_icon_host.cc

@@ -2,16 +2,16 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/win/notify_icon_host.h"
+#include "shell/browser/ui/win/notify_icon_host.h"
 
 #include <commctrl.h>
 #include <winuser.h>
 
-#include "atom/browser/ui/win/notify_icon.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/win/win_util.h"
 #include "base/win/wrapped_window_proc.h"
+#include "shell/browser/ui/win/notify_icon.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/win/system_event_state_lookup.h"
 #include "ui/gfx/win/hwnd_util.h"

shell/browser/ui/win/taskbar_host.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/win/taskbar_host.h"
+#include "shell/browser/ui/win/taskbar_host.h"
 
 #include <objbase.h>
 #include <string>
 
-#include "atom/browser/native_window.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_gdi_object.h"
+#include "shell/browser/native_window.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/display/win/screen_win.h"
 #include "ui/gfx/icon_util.h"

shell/browser/ui/win/taskbar_host.h

@@ -12,8 +12,8 @@
 #include <string>
 #include <vector>
 
-#include "atom/browser/native_window.h"
 #include "base/callback.h"
+#include "shell/browser/native_window.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 

shell/browser/ui/x/event_disabler.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/x/event_disabler.h"
+#include "shell/browser/ui/x/event_disabler.h"
 
 #include <memory>
 

shell/browser/ui/x/window_state_watcher.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/x/window_state_watcher.h"
+#include "shell/browser/ui/x/window_state_watcher.h"
 
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/x/x11.h"

shell/browser/ui/x/window_state_watcher.h

@@ -7,7 +7,7 @@
 
 #include "ui/events/platform/platform_event_observer.h"
 
-#include "atom/browser/native_window_views.h"
+#include "shell/browser/native_window_views.h"
 
 namespace atom {
 

shell/browser/ui/x/x_window_utils.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/x/x_window_utils.h"
+#include "shell/browser/ui/x/x_window_utils.h"
 
 #include <X11/Xatom.h>
 #include <memory>