diff options
Diffstat (limited to 'content/shell')
-rw-r--r-- | content/shell/android/shell_jni_registrar.cc | 2 | ||||
-rw-r--r-- | content/shell/android/shell_manager.cc | 6 | ||||
-rw-r--r-- | content/shell/app/shell_main_delegate.cc | 4 | ||||
-rw-r--r-- | content/shell/browser/minimal_shell.cc (renamed from content/shell/minimal_shell.cc) | 2 | ||||
-rw-r--r-- | content/shell/browser/minimal_shell.h (renamed from content/shell/minimal_shell.h) | 6 | ||||
-rw-r--r-- | content/shell/browser/notify_done_forwarder.cc (renamed from content/shell/notify_done_forwarder.cc) | 6 | ||||
-rw-r--r-- | content/shell/browser/notify_done_forwarder.h (renamed from content/shell/notify_done_forwarder.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell.cc (renamed from content/shell/shell.cc) | 16 | ||||
-rw-r--r-- | content/shell/browser/shell.h (renamed from content/shell/shell.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_android.cc (renamed from content/shell/shell_android.cc) | 4 | ||||
-rw-r--r-- | content/shell/browser/shell_application_mac.h (renamed from content/shell/shell_application_mac.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_application_mac.mm (renamed from content/shell/shell_application_mac.mm) | 10 | ||||
-rw-r--r-- | content/shell/browser/shell_aura.cc (renamed from content/shell/shell_aura.cc) | 6 | ||||
-rw-r--r-- | content/shell/browser/shell_browser_context.cc (renamed from content/shell/shell_browser_context.cc) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_browser_context.h (renamed from content/shell/shell_browser_context.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_browser_main.cc (renamed from content/shell/shell_browser_main.cc) | 10 | ||||
-rw-r--r-- | content/shell/browser/shell_browser_main.h (renamed from content/shell/shell_browser_main.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_browser_main_parts.cc (renamed from content/shell/shell_browser_main_parts.cc) | 14 | ||||
-rw-r--r-- | content/shell/browser/shell_browser_main_parts.h (renamed from content/shell/shell_browser_main_parts.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_browser_main_parts_mac.mm (renamed from content/shell/shell_browser_main_parts_mac.mm) | 6 | ||||
-rw-r--r-- | content/shell/browser/shell_content_browser_client.cc (renamed from content/shell/shell_content_browser_client.cc) | 24 | ||||
-rw-r--r-- | content/shell/browser/shell_content_browser_client.h (renamed from content/shell/shell_content_browser_client.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_devtools_delegate.cc (renamed from content/shell/shell_devtools_delegate.cc) | 6 | ||||
-rw-r--r-- | content/shell/browser/shell_devtools_delegate.h (renamed from content/shell/shell_devtools_delegate.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_devtools_frontend.cc (renamed from content/shell/shell_devtools_frontend.cc) | 14 | ||||
-rw-r--r-- | content/shell/browser/shell_devtools_frontend.h (renamed from content/shell/shell_devtools_frontend.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_download_manager_delegate.cc (renamed from content/shell/shell_download_manager_delegate.cc) | 6 | ||||
-rw-r--r-- | content/shell/browser/shell_download_manager_delegate.h (renamed from content/shell/shell_download_manager_delegate.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_gtk.cc (renamed from content/shell/shell_gtk.cc) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_javascript_dialog.h (renamed from content/shell/shell_javascript_dialog.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_javascript_dialog_gtk.cc (renamed from content/shell/shell_javascript_dialog_gtk.cc) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_javascript_dialog_mac.mm (renamed from content/shell/shell_javascript_dialog_mac.mm) | 6 | ||||
-rw-r--r-- | content/shell/browser/shell_javascript_dialog_manager.cc (renamed from content/shell/shell_javascript_dialog_manager.cc) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_javascript_dialog_manager.h (renamed from content/shell/shell_javascript_dialog_manager.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_javascript_dialog_win.cc (renamed from content/shell/shell_javascript_dialog_win.cc) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_layout_tests_android.cc (renamed from content/shell/shell_layout_tests_android.cc) | 2 | ||||
-rw-r--r-- | content/shell/browser/shell_layout_tests_android.h (renamed from content/shell/shell_layout_tests_android.h) | 6 | ||||
-rw-r--r-- | content/shell/browser/shell_login_dialog.cc (renamed from content/shell/shell_login_dialog.cc) | 4 | ||||
-rw-r--r-- | content/shell/browser/shell_login_dialog.h (renamed from content/shell/shell_login_dialog.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_login_dialog_gtk.cc (renamed from content/shell/shell_login_dialog_gtk.cc) | 4 | ||||
-rw-r--r-- | content/shell/browser/shell_login_dialog_mac.mm (renamed from content/shell/shell_login_dialog_mac.mm) | 4 | ||||
-rw-r--r-- | content/shell/browser/shell_mac.mm (renamed from content/shell/shell_mac.mm) | 4 | ||||
-rw-r--r-- | content/shell/browser/shell_message_filter.cc (renamed from content/shell/shell_message_filter.cc) | 10 | ||||
-rw-r--r-- | content/shell/browser/shell_message_filter.h (renamed from content/shell/shell_message_filter.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_net_log.cc (renamed from content/shell/shell_net_log.cc) | 2 | ||||
-rw-r--r-- | content/shell/browser/shell_net_log.h (renamed from content/shell/shell_net_log.h) | 6 | ||||
-rw-r--r-- | content/shell/browser/shell_network_delegate.cc (renamed from content/shell/shell_network_delegate.cc) | 4 | ||||
-rw-r--r-- | content/shell/browser/shell_network_delegate.h (renamed from content/shell/shell_network_delegate.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_plugin_service_filter.cc (renamed from content/shell/shell_plugin_service_filter.cc) | 4 | ||||
-rw-r--r-- | content/shell/browser/shell_plugin_service_filter.h (renamed from content/shell/shell_plugin_service_filter.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_quota_permission_context.cc (renamed from content/shell/shell_quota_permission_context.cc) | 4 | ||||
-rw-r--r-- | content/shell/browser/shell_quota_permission_context.h (renamed from content/shell/shell_quota_permission_context.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_resource_dispatcher_host_delegate.cc (renamed from content/shell/shell_resource_dispatcher_host_delegate.cc) | 6 | ||||
-rw-r--r-- | content/shell/browser/shell_resource_dispatcher_host_delegate.h (renamed from content/shell/shell_resource_dispatcher_host_delegate.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_url_request_context_getter.cc (renamed from content/shell/shell_url_request_context_getter.cc) | 6 | ||||
-rw-r--r-- | content/shell/browser/shell_url_request_context_getter.h (renamed from content/shell/shell_url_request_context_getter.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_web_contents_view_delegate.h (renamed from content/shell/shell_web_contents_view_delegate.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_web_contents_view_delegate_android.cc (renamed from content/shell/shell_web_contents_view_delegate_android.cc) | 6 | ||||
-rw-r--r-- | content/shell/browser/shell_web_contents_view_delegate_creator.h (renamed from content/shell/shell_web_contents_view_delegate_creator.h) | 8 | ||||
-rw-r--r-- | content/shell/browser/shell_web_contents_view_delegate_gtk.cc (renamed from content/shell/shell_web_contents_view_delegate_gtk.cc) | 16 | ||||
-rw-r--r-- | content/shell/browser/shell_web_contents_view_delegate_mac.mm (renamed from content/shell/shell_web_contents_view_delegate_mac.mm) | 16 | ||||
-rw-r--r-- | content/shell/browser/shell_web_contents_view_delegate_win.cc (renamed from content/shell/shell_web_contents_view_delegate_win.cc) | 16 | ||||
-rw-r--r-- | content/shell/browser/shell_win.cc (renamed from content/shell/shell_win.cc) | 6 | ||||
-rw-r--r-- | content/shell/browser/webkit_test_controller.cc (renamed from content/shell/webkit_test_controller.cc) | 10 | ||||
-rw-r--r-- | content/shell/browser/webkit_test_controller.h (renamed from content/shell/webkit_test_controller.h) | 8 | ||||
-rw-r--r-- | content/shell/geolocation/shell_access_token_store.cc | 2 |
66 files changed, 251 insertions, 251 deletions
diff --git a/content/shell/android/shell_jni_registrar.cc b/content/shell/android/shell_jni_registrar.cc index 504eda7..bd71354 100644 --- a/content/shell/android/shell_jni_registrar.cc +++ b/content/shell/android/shell_jni_registrar.cc @@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "content/shell/android/shell_manager.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" namespace { diff --git a/content/shell/android/shell_manager.cc b/content/shell/android/shell_manager.cc index 08df6a4..9dbd46d 100644 --- a/content/shell/android/shell_manager.cc +++ b/content/shell/android/shell_manager.cc @@ -10,9 +10,9 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "content/public/browser/web_contents.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "jni/ShellManager_jni.h" #include "url/gurl.h" diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc index b5adadb..283f2d3 100644 --- a/content/shell/app/shell_main_delegate.cc +++ b/content/shell/app/shell_main_delegate.cc @@ -14,10 +14,10 @@ #include "content/public/common/url_constants.h" #include "content/public/test/layouttest_support.h" #include "content/shell/app/webkit_test_platform_support.h" +#include "content/shell/browser/shell_browser_main.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/common/shell_switches.h" #include "content/shell/renderer/shell_content_renderer_client.h" -#include "content/shell/shell_browser_main.h" -#include "content/shell/shell_content_browser_client.h" #include "net/cookies/cookie_monster.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" diff --git a/content/shell/minimal_shell.cc b/content/shell/browser/minimal_shell.cc index 2e9079e..e7e88f8 100644 --- a/content/shell/minimal_shell.cc +++ b/content/shell/browser/minimal_shell.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 "content/shell/minimal_shell.h" +#include "content/shell/browser/minimal_shell.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/focus_manager.h" diff --git a/content/shell/minimal_shell.h b/content/shell/browser/minimal_shell.h index b2ab9eb..1388da9 100644 --- a/content/shell/minimal_shell.h +++ b/content/shell/browser/minimal_shell.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_MINIMAL_SHELL_H_ -#define CONTENT_SHELL_MINIMAL_SHELL_H_ +#ifndef CONTENT_SHELL_BROWSER_MINIMAL_SHELL_H_ +#define CONTENT_SHELL_BROWSER_MINIMAL_SHELL_H_ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" @@ -64,4 +64,4 @@ class MinimalShell : public aura::client::StackingClient { } // namespace content; -#endif // CONTENT_SHELL_MINIMAL_SHELL_H_ +#endif // CONTENT_SHELL_BROWSER_MINIMAL_SHELL_H_ diff --git a/content/shell/notify_done_forwarder.cc b/content/shell/browser/notify_done_forwarder.cc index 522138e..6d8f104 100644 --- a/content/shell/notify_done_forwarder.cc +++ b/content/shell/browser/notify_done_forwarder.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/notify_done_forwarder.h" +#include "content/shell/browser/notify_done_forwarder.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_messages.h" -#include "content/shell/webkit_test_controller.h" namespace content { diff --git a/content/shell/notify_done_forwarder.h b/content/shell/browser/notify_done_forwarder.h index 008371a..e5a2f3f7 100644 --- a/content/shell/notify_done_forwarder.h +++ b/content/shell/browser/notify_done_forwarder.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_NOTIFY_DONE_FORWARDER_H_ -#define CONTENT_SHELL_NOTIFY_DONE_FORWARDER_H_ +#ifndef CONTENT_SHELL_BROWSER_NOTIFY_DONE_FORWARDER_H_ +#define CONTENT_SHELL_BROWSER_NOTIFY_DONE_FORWARDER_H_ #include "base/basictypes.h" #include "content/public/browser/web_contents_observer.h" @@ -31,4 +31,4 @@ class NotifyDoneForwarder : public WebContentsObserver, } // namespace content -#endif // CONTENT_SHELL_NOTIFY_DONE_FORWARDER_H_ +#endif // CONTENT_SHELL_BROWSER_NOTIFY_DONE_FORWARDER_H_ diff --git a/content/shell/shell.cc b/content/shell/browser/shell.cc index 93f13bf..c8616d3 100644 --- a/content/shell/shell.cc +++ b/content/shell/browser/shell.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "base/auto_reset.h" #include "base/command_line.h" @@ -23,14 +23,14 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/renderer_preferences.h" +#include "content/shell/browser/notify_done_forwarder.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_devtools_frontend.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_messages.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/notify_done_forwarder.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_devtools_frontend.h" -#include "content/shell/shell_javascript_dialog_manager.h" -#include "content/shell/webkit_test_controller.h" namespace content { diff --git a/content/shell/shell.h b/content/shell/browser/shell.h index 8666aec..24c58c8 100644 --- a/content/shell/shell.h +++ b/content/shell/browser/shell.h @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_H_ -#define CONTENT_SHELL_SHELL_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_H_ +#define CONTENT_SHELL_BROWSER_SHELL_H_ #include <vector> @@ -283,4 +283,4 @@ class Shell : public WebContentsDelegate, } // namespace content -#endif // CONTENT_SHELL_SHELL_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_H_ diff --git a/content/shell/shell_android.cc b/content/shell/browser/shell_android.cc index d12d0d7..d827e96 100644 --- a/content/shell/shell_android.cc +++ b/content/shell/browser/shell_android.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include <jni.h> diff --git a/content/shell/shell_application_mac.h b/content/shell/browser/shell_application_mac.h index 26718ac..bcba5a5 100644 --- a/content/shell/shell_application_mac.h +++ b/content/shell/browser/shell_application_mac.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_APPLICATION_MAC_H_ -#define CONTENT_SHELL_SHELL_APPLICATION_MAC_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_APPLICATION_MAC_H_ +#define CONTENT_SHELL_BROWSER_SHELL_APPLICATION_MAC_H_ #include "base/mac/scoped_sending_event.h" #include "base/message_loop/message_pump_mac.h" @@ -24,4 +24,4 @@ @end -#endif // CONTENT_SHELL_SHELL_APPLICATION_MAC_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_APPLICATION_MAC_H_ diff --git a/content/shell/shell_application_mac.mm b/content/shell/browser/shell_application_mac.mm index 8300ebf..e18df5b 100644 --- a/content/shell/shell_application_mac.mm +++ b/content/shell/browser/shell_application_mac.mm @@ -1,14 +1,14 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_application_mac.h" +#include "content/shell/browser/shell_application_mac.h" #include "base/auto_reset.h" #include "content/public/common/url_constants.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "url/gurl.h" @implementation ShellCrApplication diff --git a/content/shell/shell_aura.cc b/content/shell/browser/shell_aura.cc index b7bf5d0..03884da 100644 --- a/content/shell/shell_aura.cc +++ b/content/shell/browser/shell_aura.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" @@ -30,7 +30,7 @@ #if defined(OS_CHROMEOS) #include "chromeos/dbus/dbus_thread_manager.h" -#include "content/shell/minimal_shell.h" +#include "content/shell/browser/minimal_shell.h" #include "ui/aura/test/test_screen.h" #endif diff --git a/content/shell/shell_browser_context.cc b/content/shell/browser/shell_browser_context.cc index 1c89355..c6dbb99 100644 --- a/content/shell/shell_browser_context.cc +++ b/content/shell/browser/shell_browser_context.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_browser_context.h" +#include "content/shell/browser/shell_browser_context.h" #include "base/bind.h" #include "base/command_line.h" @@ -15,9 +15,9 @@ #include "content/public/browser/resource_context.h" #include "content/public/browser/storage_partition.h" #include "content/public/common/content_switches.h" +#include "content/shell/browser/shell_download_manager_delegate.h" +#include "content/shell/browser/shell_url_request_context_getter.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell_download_manager_delegate.h" -#include "content/shell/shell_url_request_context_getter.h" #if defined(OS_WIN) #include "base/base_paths_win.h" diff --git a/content/shell/shell_browser_context.h b/content/shell/browser/shell_browser_context.h index 640f237..ec71591 100644 --- a/content/shell/shell_browser_context.h +++ b/content/shell/browser/shell_browser_context.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_BROWSER_CONTEXT_H_ -#define CONTENT_SHELL_SHELL_BROWSER_CONTEXT_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_ +#define CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_ #include "base/compiler_specific.h" #include "base/files/file_path.h" @@ -80,4 +80,4 @@ class ShellBrowserContext : public BrowserContext { } // namespace content -#endif // CONTENT_SHELL_SHELL_BROWSER_CONTEXT_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_ diff --git a/content/shell/shell_browser_main.cc b/content/shell/browser/shell_browser_main.cc index a267fe2..ac520d6 100644 --- a/content/shell/shell_browser_main.cc +++ b/content/shell/browser/shell_browser_main.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_browser_main.h" +#include "content/shell/browser/shell_browser_main.h" #include <iostream> @@ -17,16 +17,16 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_main_runner.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_switches.h" #include "content/shell/common/webkit_test_helpers.h" -#include "content/shell/shell.h" -#include "content/shell/webkit_test_controller.h" #include "net/base/net_util.h" #include "webkit/support/webkit_support.h" #if defined(OS_ANDROID) #include "base/run_loop.h" -#include "content/shell/shell_layout_tests_android.h" +#include "content/shell/browser/shell_layout_tests_android.h" #endif namespace { diff --git a/content/shell/shell_browser_main.h b/content/shell/browser/shell_browser_main.h index 7fe5908..d361fa3 100644 --- a/content/shell/shell_browser_main.h +++ b/content/shell/browser/shell_browser_main.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_BROWSER_MAIN_H_ -#define CONTENT_SHELL_SHELL_BROWSER_MAIN_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_H_ +#define CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_H_ #include "base/memory/scoped_ptr.h" @@ -16,4 +16,4 @@ int ShellBrowserMain( const content::MainFunctionParams& parameters, const scoped_ptr<content::BrowserMainRunner>& main_runner); -#endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_H_ diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc index bf7233a..6f7da00 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/browser/shell_browser_main_parts.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_browser_main_parts.h" +#include "content/shell/browser/shell_browser_main_parts.h" #include "base/bind.h" #include "base/command_line.h" @@ -16,11 +16,11 @@ #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" #include "content/public/common/url_constants.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_devtools_delegate.h" +#include "content/shell/browser/shell_net_log.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_devtools_delegate.h" -#include "content/shell/shell_net_log.h" #include "grit/net_resources.h" #include "net/base/net_module.h" #include "net/base/net_util.h" @@ -30,7 +30,7 @@ #if defined(ENABLE_PLUGINS) #include "content/public/browser/plugin_service.h" -#include "content/shell/shell_plugin_service_filter.h" +#include "content/shell/browser/shell_plugin_service_filter.h" #endif #if defined(OS_ANDROID) diff --git a/content/shell/shell_browser_main_parts.h b/content/shell/browser/shell_browser_main_parts.h index 25a4449..990e1c5 100644 --- a/content/shell/shell_browser_main_parts.h +++ b/content/shell/browser/shell_browser_main_parts.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ -#define CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ +#define CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -67,4 +67,4 @@ class ShellBrowserMainParts : public BrowserMainParts { } // namespace content -#endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ diff --git a/content/shell/shell_browser_main_parts_mac.mm b/content/shell/browser/shell_browser_main_parts_mac.mm index b2b84b7..a933705 100644 --- a/content/shell/shell_browser_main_parts_mac.mm +++ b/content/shell/browser/shell_browser_main_parts_mac.mm @@ -1,14 +1,14 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_browser_main_parts.h" +#include "content/shell/browser/shell_browser_main_parts.h" #import <Cocoa/Cocoa.h> #include "base/mac/bundle_locations.h" #include "base/mac/scoped_nsobject.h" -#include "content/shell/shell_application_mac.h" +#include "content/shell/browser/shell_application_mac.h" namespace content { diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc index ac37954..715eafd 100644 --- a/content/shell/shell_content_browser_client.cc +++ b/content/shell/browser/shell_content_browser_client.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_content_browser_client.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "base/command_line.h" #include "base/file_util.h" @@ -14,20 +14,20 @@ #include "content/public/browser/storage_partition.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_devtools_delegate.h" +#include "content/shell/browser/shell_message_filter.h" +#include "content/shell/browser/shell_net_log.h" +#include "content/shell/browser/shell_quota_permission_context.h" +#include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" +#include "content/shell/browser/shell_web_contents_view_delegate_creator.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_messages.h" #include "content/shell/common/shell_switches.h" #include "content/shell/common/webkit_test_helpers.h" #include "content/shell/geolocation/shell_access_token_store.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_devtools_delegate.h" -#include "content/shell/shell_message_filter.h" -#include "content/shell/shell_net_log.h" -#include "content/shell/shell_quota_permission_context.h" -#include "content/shell/shell_resource_dispatcher_host_delegate.h" -#include "content/shell/shell_web_contents_view_delegate_creator.h" -#include "content/shell/webkit_test_controller.h" #include "net/url_request/url_request_context_getter.h" #include "url/gurl.h" #include "webkit/common/webpreferences.h" diff --git a/content/shell/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h index 917a955..15285ca 100644 --- a/content/shell/shell_content_browser_client.h +++ b/content/shell/browser/shell_content_browser_client.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ -#define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ +#define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ #include <string> @@ -100,4 +100,4 @@ class ShellContentBrowserClient : public ContentBrowserClient, } // namespace content -#endif // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ diff --git a/content/shell/shell_devtools_delegate.cc b/content/shell/browser/shell_devtools_delegate.cc index d6fe39c..0a01405 100644 --- a/content/shell/shell_devtools_delegate.cc +++ b/content/shell/browser/shell_devtools_delegate.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_devtools_delegate.h" +#include "content/shell/browser/shell_devtools_delegate.h" #include <vector> @@ -13,7 +13,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "grit/shell_resources.h" #include "net/socket/tcp_listen_socket.h" #include "ui/base/resource/resource_bundle.h" diff --git a/content/shell/shell_devtools_delegate.h b/content/shell/browser/shell_devtools_delegate.h index dd4e762..a218738 100644 --- a/content/shell/shell_devtools_delegate.h +++ b/content/shell/browser/shell_devtools_delegate.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_DEVTOOLS_DELEGATE_H_ -#define CONTENT_SHELL_SHELL_DEVTOOLS_DELEGATE_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_DELEGATE_H_ +#define CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_DELEGATE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -47,4 +47,4 @@ class ShellDevToolsDelegate : public DevToolsHttpHandlerDelegate { } // namespace content -#endif // CONTENT_SHELL_SHELL_DEVTOOLS_DELEGATE_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_DELEGATE_H_ diff --git a/content/shell/shell_devtools_frontend.cc b/content/shell/browser/shell_devtools_frontend.cc index d102eaa..8c3f74b 100644 --- a/content/shell/shell_devtools_frontend.cc +++ b/content/shell/browser/shell_devtools_frontend.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_devtools_frontend.h" +#include "content/shell/browser/shell_devtools_frontend.h" #include "base/command_line.h" #include "base/path_service.h" @@ -11,12 +11,12 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/content_client.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_devtools_delegate.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_devtools_delegate.h" #include "net/base/net_util.h" namespace content { diff --git a/content/shell/shell_devtools_frontend.h b/content/shell/browser/shell_devtools_frontend.h index a76cbc3..b6a617f 100644 --- a/content/shell/shell_devtools_frontend.h +++ b/content/shell/browser/shell_devtools_frontend.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_DEVTOOLS_FRONTEND_H_ -#define CONTENT_SHELL_SHELL_DEVTOOLS_FRONTEND_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_FRONTEND_H_ +#define CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_FRONTEND_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -70,4 +70,4 @@ class ShellDevToolsFrontend : public WebContentsObserver, } // namespace content -#endif // CONTENT_SHELL_SHELL_DEVTOOLS_FRONTEND_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_FRONTEND_H_ diff --git a/content/shell/shell_download_manager_delegate.cc b/content/shell/browser/shell_download_manager_delegate.cc index 624ece5..1dbbea7 100644 --- a/content/shell/shell_download_manager_delegate.cc +++ b/content/shell/browser/shell_download_manager_delegate.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_download_manager_delegate.h" +#include "content/shell/browser/shell_download_manager_delegate.h" #if defined(TOOLKIT_GTK) #include <gtk/gtk.h> @@ -24,8 +24,8 @@ #include "content/public/browser/download_manager.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/webkit_test_controller.h" #include "net/base/net_util.h" namespace content { diff --git a/content/shell/shell_download_manager_delegate.h b/content/shell/browser/shell_download_manager_delegate.h index 3c699c5..afd57e7 100644 --- a/content/shell/shell_download_manager_delegate.h +++ b/content/shell/browser/shell_download_manager_delegate.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ -#define CONTENT_SHELL_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ +#define CONTENT_SHELL_BROWSER_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" @@ -62,4 +62,4 @@ class ShellDownloadManagerDelegate } // namespace content -#endif // CONTENT_SHELL_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ diff --git a/content/shell/shell_gtk.cc b/content/shell/browser/shell_gtk.cc index ee77473..a06a6a0 100644 --- a/content/shell/shell_gtk.cc +++ b/content/shell/browser/shell_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> @@ -15,8 +15,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/renderer_preferences.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" namespace content { diff --git a/content/shell/shell_javascript_dialog.h b/content/shell/browser/shell_javascript_dialog.h index b819f3b..4001334 100644 --- a/content/shell/shell_javascript_dialog.h +++ b/content/shell/browser/shell_javascript_dialog.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_H_ -#define CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ +#define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ #include "content/public/browser/javascript_dialog_manager.h" @@ -61,4 +61,4 @@ class ShellJavaScriptDialog { } // namespace content -#endif // CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ diff --git a/content/shell/shell_javascript_dialog_gtk.cc b/content/shell/browser/shell_javascript_dialog_gtk.cc index 9ba05fc..87bd6f3 100644 --- a/content/shell/shell_javascript_dialog_gtk.cc +++ b/content/shell/browser/shell_javascript_dialog_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_javascript_dialog.h" +#include "content/shell/browser/shell_javascript_dialog.h" #include <gtk/gtk.h> @@ -10,8 +10,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/shell/app/resource.h" -#include "content/shell/shell.h" -#include "content/shell/shell_javascript_dialog_manager.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" namespace { diff --git a/content/shell/shell_javascript_dialog_mac.mm b/content/shell/browser/shell_javascript_dialog_mac.mm index 0a89a89..fe9de98 100644 --- a/content/shell/shell_javascript_dialog_mac.mm +++ b/content/shell/browser/shell_javascript_dialog_mac.mm @@ -1,14 +1,14 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_javascript_dialog.h" +#include "content/shell/browser/shell_javascript_dialog.h" #import <Cocoa/Cocoa.h> #import "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" -#include "content/shell/shell_javascript_dialog_manager.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" // Helper object that receives the notification that the dialog/sheet is // going away. Is responsible for cleaning itself up. diff --git a/content/shell/shell_javascript_dialog_manager.cc b/content/shell/browser/shell_javascript_dialog_manager.cc index 9248483..1476f7c 100644 --- a/content/shell/shell_javascript_dialog_manager.cc +++ b/content/shell/browser/shell_javascript_dialog_manager.cc @@ -1,17 +1,17 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_javascript_dialog_manager.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" #include "base/command_line.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "content/shell/browser/shell_javascript_dialog.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell_javascript_dialog.h" -#include "content/shell/webkit_test_controller.h" #include "net/base/net_util.h" namespace content { diff --git a/content/shell/shell_javascript_dialog_manager.h b/content/shell/browser/shell_javascript_dialog_manager.h index 1327ab7..763736f 100644 --- a/content/shell/shell_javascript_dialog_manager.h +++ b/content/shell/browser/shell_javascript_dialog_manager.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ -#define CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ +#define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ #include "base/callback_forward.h" #include "base/compiler_specific.h" @@ -64,4 +64,4 @@ class ShellJavaScriptDialogManager : public JavaScriptDialogManager { } // namespace content -#endif // CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ diff --git a/content/shell/shell_javascript_dialog_win.cc b/content/shell/browser/shell_javascript_dialog_win.cc index c39b2d7..a59639e 100644 --- a/content/shell/shell_javascript_dialog_win.cc +++ b/content/shell/browser/shell_javascript_dialog_win.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_javascript_dialog.h" +#include "content/shell/browser/shell_javascript_dialog.h" #include "base/strings/string_util.h" #include "content/shell/app/resource.h" -#include "content/shell/shell.h" -#include "content/shell/shell_javascript_dialog_manager.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" namespace content { diff --git a/content/shell/shell_layout_tests_android.cc b/content/shell/browser/shell_layout_tests_android.cc index 68e8001..de94b8c 100644 --- a/content/shell/shell_layout_tests_android.cc +++ b/content/shell/browser/shell_layout_tests_android.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 "content/shell/shell_layout_tests_android.h" +#include "content/shell/browser/shell_layout_tests_android.h" #include "base/android/fifo_utils.h" #include "base/android/jni_android.h" diff --git a/content/shell/shell_layout_tests_android.h b/content/shell/browser/shell_layout_tests_android.h index 9a3c423..7410954 100644 --- a/content/shell/shell_layout_tests_android.h +++ b/content/shell/browser/shell_layout_tests_android.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_LAYOUT_TESTS_ANDROID_H_ -#define CONTENT_SHELL_SHELL_LAYOUT_TESTS_ANDROID_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_LAYOUT_TESTS_ANDROID_H_ +#define CONTENT_SHELL_BROWSER_SHELL_LAYOUT_TESTS_ANDROID_H_ #include <string> @@ -22,4 +22,4 @@ void EnsureInitializeForAndroidLayoutTests(); } // namespace content -#endif // CONTENT_SHELL_SHELL_LAYOUT_TESTS_ANDROID_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_LAYOUT_TESTS_ANDROID_H_ diff --git a/content/shell/shell_login_dialog.cc b/content/shell/browser/shell_login_dialog.cc index f32c427..f1639e9 100644 --- a/content/shell/shell_login_dialog.cc +++ b/content/shell/browser/shell_login_dialog.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_login_dialog.h" +#include "content/shell/browser/shell_login_dialog.h" #include "base/bind.h" #include "base/logging.h" diff --git a/content/shell/shell_login_dialog.h b/content/shell/browser/shell_login_dialog.h index 22abab4..d9b0504 100644 --- a/content/shell/shell_login_dialog.h +++ b/content/shell/browser/shell_login_dialog.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_LOGIN_DIALOG_H_ -#define CONTENT_SHELL_SHELL_LOGIN_DIALOG_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_LOGIN_DIALOG_H_ +#define CONTENT_SHELL_BROWSER_SHELL_LOGIN_DIALOG_H_ #include "base/compiler_specific.h" #include "base/strings/string16.h" @@ -94,4 +94,4 @@ class ShellLoginDialog : public ResourceDispatcherHostLoginDelegate { } // namespace content -#endif // CONTENT_SHELL_SHELL_LOGIN_DIALOG_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_LOGIN_DIALOG_H_ diff --git a/content/shell/shell_login_dialog_gtk.cc b/content/shell/browser/shell_login_dialog_gtk.cc index 1be48d3..b08b449 100644 --- a/content/shell/shell_login_dialog_gtk.cc +++ b/content/shell/browser/shell_login_dialog_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_login_dialog.h" +#include "content/shell/browser/shell_login_dialog.h" #include <gtk/gtk.h> diff --git a/content/shell/shell_login_dialog_mac.mm b/content/shell/browser/shell_login_dialog_mac.mm index b7d6947..447aa58 100644 --- a/content/shell/shell_login_dialog_mac.mm +++ b/content/shell/browser/shell_login_dialog_mac.mm @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_login_dialog.h" +#include "content/shell/browser/shell_login_dialog.h" #import <Cocoa/Cocoa.h> diff --git a/content/shell/shell_mac.mm b/content/shell/browser/shell_mac.mm index 370a64d..ca6a0ff 100644 --- a/content/shell/shell_mac.mm +++ b/content/shell/browser/shell_mac.mm @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include <algorithm> diff --git a/content/shell/shell_message_filter.cc b/content/shell/browser/shell_message_filter.cc index 7bfe8267..c7c4cca 100644 --- a/content/shell/shell_message_filter.cc +++ b/content/shell/browser/shell_message_filter.cc @@ -1,16 +1,16 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_message_filter.h" +#include "content/shell/browser/shell_message_filter.h" #include "base/file_util.h" #include "base/threading/thread_restrictions.h" #include "content/public/browser/child_process_security_policy.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_network_delegate.h" #include "content/shell/common/shell_messages.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_network_delegate.h" #include "net/base/net_errors.h" #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" diff --git a/content/shell/shell_message_filter.h b/content/shell/browser/shell_message_filter.h index b53908e..135a915 100644 --- a/content/shell/shell_message_filter.h +++ b/content/shell/browser/shell_message_filter.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_MESSAGE_FILTER_H_ -#define CONTENT_SHELL_SHELL_MESSAGE_FILTER_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_MESSAGE_FILTER_H_ +#define CONTENT_SHELL_BROWSER_SHELL_MESSAGE_FILTER_H_ #include <string> #include <vector> @@ -63,4 +63,4 @@ class ShellMessageFilter : public BrowserMessageFilter { } // namespace content -#endif // CONTENT_SHELL_SHELL_MESSAGE_FILTER_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_MESSAGE_FILTER_H_ diff --git a/content/shell/shell_net_log.cc b/content/shell/browser/shell_net_log.cc index 03443d2..97276d6 100644 --- a/content/shell/shell_net_log.cc +++ b/content/shell/browser/shell_net_log.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 "content/shell/shell_net_log.h" +#include "content/shell/browser/shell_net_log.h" #include <stdio.h> diff --git a/content/shell/shell_net_log.h b/content/shell/browser/shell_net_log.h index ead9108..9846917 100644 --- a/content/shell/shell_net_log.h +++ b/content/shell/browser/shell_net_log.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ -#define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_NET_LOG_H_ +#define CONTENT_SHELL_BROWSER_SHELL_NET_LOG_H_ #include <string> @@ -25,4 +25,4 @@ class ShellNetLog : public net::NetLog { } // namespace content -#endif // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_NET_LOG_H_ diff --git a/content/shell/shell_network_delegate.cc b/content/shell/browser/shell_network_delegate.cc index e633686e..560426f 100644 --- a/content/shell/shell_network_delegate.cc +++ b/content/shell/browser/shell_network_delegate.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_network_delegate.h" +#include "content/shell/browser/shell_network_delegate.h" #include "net/base/net_errors.h" #include "net/base/static_cookie_policy.h" diff --git a/content/shell/shell_network_delegate.h b/content/shell/browser/shell_network_delegate.h index c2f5e8e..a3ce0a2 100644 --- a/content/shell/shell_network_delegate.h +++ b/content/shell/browser/shell_network_delegate.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_NETWORK_DELEGATE_H_ -#define CONTENT_SHELL_SHELL_NETWORK_DELEGATE_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_NETWORK_DELEGATE_H_ +#define CONTENT_SHELL_BROWSER_SHELL_NETWORK_DELEGATE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -68,4 +68,4 @@ class ShellNetworkDelegate : public net::NetworkDelegate { } // namespace content -#endif // CONTENT_SHELL_SHELL_NETWORK_DELEGATE_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_NETWORK_DELEGATE_H_ diff --git a/content/shell/shell_plugin_service_filter.cc b/content/shell/browser/shell_plugin_service_filter.cc index f164637..d41b9bd 100644 --- a/content/shell/shell_plugin_service_filter.cc +++ b/content/shell/browser/shell_plugin_service_filter.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_plugin_service_filter.h" +#include "content/shell/browser/shell_plugin_service_filter.h" #include "base/strings/utf_string_conversions.h" #include "content/public/common/webplugininfo.h" diff --git a/content/shell/shell_plugin_service_filter.h b/content/shell/browser/shell_plugin_service_filter.h index a489aff..3e9cb5d 100644 --- a/content/shell/shell_plugin_service_filter.h +++ b/content/shell/browser/shell_plugin_service_filter.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_PLUGIN_SERVICE_FILTER_H_ -#define CONTENT_SHELL_SHELL_PLUGIN_SERVICE_FILTER_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_PLUGIN_SERVICE_FILTER_H_ +#define CONTENT_SHELL_BROWSER_SHELL_PLUGIN_SERVICE_FILTER_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -34,4 +34,4 @@ class ShellPluginServiceFilter : public PluginServiceFilter { } // namespace content -#endif // CONTENT_SHELL_SHELL_PLUGIN_SERVICE_FILTER_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_PLUGIN_SERVICE_FILTER_H_ diff --git a/content/shell/shell_quota_permission_context.cc b/content/shell/browser/shell_quota_permission_context.cc index fe0df90..064322f 100644 --- a/content/shell/shell_quota_permission_context.cc +++ b/content/shell/browser/shell_quota_permission_context.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_quota_permission_context.h" +#include "content/shell/browser/shell_quota_permission_context.h" #include "webkit/common/quota/quota_types.h" diff --git a/content/shell/shell_quota_permission_context.h b/content/shell/browser/shell_quota_permission_context.h index af7f62f..381338d 100644 --- a/content/shell/shell_quota_permission_context.h +++ b/content/shell/browser/shell_quota_permission_context.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_QUOTA_PERMISSION_CONTEXT_H_ -#define CONTENT_SHELL_SHELL_QUOTA_PERMISSION_CONTEXT_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_QUOTA_PERMISSION_CONTEXT_H_ +#define CONTENT_SHELL_BROWSER_SHELL_QUOTA_PERMISSION_CONTEXT_H_ #include "base/compiler_specific.h" #include "content/public/browser/quota_permission_context.h" @@ -31,4 +31,4 @@ class ShellQuotaPermissionContext : public QuotaPermissionContext { } // namespace content -#endif // CONTENT_SHELL_SHELL_QUOTA_PERMISSION_CONTEXT_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_QUOTA_PERMISSION_CONTEXT_H_ diff --git a/content/shell/shell_resource_dispatcher_host_delegate.cc b/content/shell/browser/shell_resource_dispatcher_host_delegate.cc index 1637edd..d0994b1 100644 --- a/content/shell/shell_resource_dispatcher_host_delegate.cc +++ b/content/shell/browser/shell_resource_dispatcher_host_delegate.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_resource_dispatcher_host_delegate.h" +#include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" #include "base/command_line.h" +#include "content/shell/browser/shell_login_dialog.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell_login_dialog.h" namespace content { diff --git a/content/shell/shell_resource_dispatcher_host_delegate.h b/content/shell/browser/shell_resource_dispatcher_host_delegate.h index ff78e48..90e6d4c 100644 --- a/content/shell/shell_resource_dispatcher_host_delegate.h +++ b/content/shell/browser/shell_resource_dispatcher_host_delegate.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ -#define CONTENT_SHELL_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ +#define CONTENT_SHELL_BROWSER_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ #include "base/callback.h" #include "base/compiler_specific.h" @@ -37,4 +37,4 @@ class ShellResourceDispatcherHostDelegate } // namespace content -#endif // CONTENT_SHELL_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/browser/shell_url_request_context_getter.cc index 969ba3d..dfdb852 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/browser/shell_url_request_context_getter.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_url_request_context_getter.h" +#include "content/shell/browser/shell_url_request_context_getter.h" #include "base/command_line.h" #include "base/logging.h" @@ -14,8 +14,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" +#include "content/shell/browser/shell_network_delegate.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell_network_delegate.h" #include "net/base/cache_type.h" #include "net/cert/cert_verifier.h" #include "net/cookies/cookie_monster.h" diff --git a/content/shell/shell_url_request_context_getter.h b/content/shell/browser/shell_url_request_context_getter.h index d1afb6f..b18c0a9 100644 --- a/content/shell/shell_url_request_context_getter.h +++ b/content/shell/browser/shell_url_request_context_getter.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ -#define CONTENT_SHELL_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ +#define CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ #include "base/compiler_specific.h" #include "base/files/file_path.h" @@ -66,4 +66,4 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter { } // namespace content -#endif // CONTENT_SHELL_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ diff --git a/content/shell/shell_web_contents_view_delegate.h b/content/shell/browser/shell_web_contents_view_delegate.h index f9292a8..86d97b4 100644 --- a/content/shell/shell_web_contents_view_delegate.h +++ b/content/shell/browser/shell_web_contents_view_delegate.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ -#define CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ +#define CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view_delegate.h" @@ -80,4 +80,4 @@ class ShellWebContentsViewDelegate : public WebContentsViewDelegate { } // namespace content -#endif // CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ diff --git a/content/shell/shell_web_contents_view_delegate_android.cc b/content/shell/browser/shell_web_contents_view_delegate_android.cc index a5b4c82..3da5475 100644 --- a/content/shell/shell_web_contents_view_delegate_android.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_android.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_web_contents_view_delegate.h" +#include "content/shell/browser/shell_web_contents_view_delegate.h" #include "base/command_line.h" #include "content/public/browser/android/content_view_core.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/context_menu_params.h" -#include "content/shell/shell_web_contents_view_delegate_creator.h" +#include "content/shell/browser/shell_web_contents_view_delegate_creator.h" namespace content { diff --git a/content/shell/shell_web_contents_view_delegate_creator.h b/content/shell/browser/shell_web_contents_view_delegate_creator.h index 707bbd9..819ce1e 100644 --- a/content/shell/shell_web_contents_view_delegate_creator.h +++ b/content/shell/browser/shell_web_contents_view_delegate_creator.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ -#define CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ +#define CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ namespace content { @@ -15,4 +15,4 @@ WebContentsViewDelegate* CreateShellWebContentsViewDelegate( } // namespace content -#endif //CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ +#endif //CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ diff --git a/content/shell/shell_web_contents_view_delegate_gtk.cc b/content/shell/browser/shell_web_contents_view_delegate_gtk.cc index 9f1318b..4c98257 100644 --- a/content/shell/shell_web_contents_view_delegate_gtk.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_web_contents_view_delegate.h" +#include "content/shell/browser/shell_web_contents_view_delegate.h" #include "base/command_line.h" #include "content/public/browser/render_process_host.h" @@ -11,13 +11,13 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/context_menu_params.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_devtools_frontend.h" +#include "content/shell/browser/shell_web_contents_view_delegate_creator.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_devtools_frontend.h" -#include "content/shell/shell_web_contents_view_delegate_creator.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" #include "ui/base/gtk/focus_store_gtk.h" #include "ui/base/gtk/gtk_floating_container.h" diff --git a/content/shell/shell_web_contents_view_delegate_mac.mm b/content/shell/browser/shell_web_contents_view_delegate_mac.mm index 606a826..00196af 100644 --- a/content/shell/shell_web_contents_view_delegate_mac.mm +++ b/content/shell/browser/shell_web_contents_view_delegate_mac.mm @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_web_contents_view_delegate.h" +#include "content/shell/browser/shell_web_contents_view_delegate.h" #import <Cocoa/Cocoa.h> @@ -13,13 +13,13 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/context_menu_params.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_devtools_frontend.h" +#include "content/shell/browser/shell_web_contents_view_delegate_creator.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_devtools_frontend.h" -#include "content/shell/shell_web_contents_view_delegate_creator.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" using WebKit::WebContextMenuData; diff --git a/content/shell/shell_web_contents_view_delegate_win.cc b/content/shell/browser/shell_web_contents_view_delegate_win.cc index a062dea..cd387f0 100644 --- a/content/shell/shell_web_contents_view_delegate_win.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell_web_contents_view_delegate.h" +#include "content/shell/browser/shell_web_contents_view_delegate.h" #include "base/command_line.h" #include "content/public/browser/render_process_host.h" @@ -11,13 +11,13 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/context_menu_params.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_devtools_frontend.h" +#include "content/shell/browser/shell_web_contents_view_delegate_creator.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_devtools_frontend.h" -#include "content/shell/shell_web_contents_view_delegate_creator.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" using WebKit::WebContextMenuData; diff --git a/content/shell/shell_win.cc b/content/shell/browser/shell_win.cc index d6d9497..d1bb402 100644 --- a/content/shell/shell_win.cc +++ b/content/shell/browser/shell_win.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/shell.h" +#include "content/shell/browser/shell.h" +#include <windows.h> #include <commctrl.h> #include <fcntl.h> #include <io.h> -#include <windows.h> #include "base/strings/utf_string_conversions.h" #include "base/win/wrapped_window_proc.h" diff --git a/content/shell/webkit_test_controller.cc b/content/shell/browser/webkit_test_controller.cc index 147367e..40ed9c5 100644 --- a/content/shell/webkit_test_controller.cc +++ b/content/shell/browser/webkit_test_controller.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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 "content/shell/webkit_test_controller.h" +#include "content/shell/browser/webkit_test_controller.h" #include <iostream> @@ -24,12 +24,12 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/content_switches.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/common/shell_messages.h" #include "content/shell/common/shell_switches.h" #include "content/shell/common/webkit_test_helpers.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" #include "ui/gfx/codec/png_codec.h" namespace content { diff --git a/content/shell/webkit_test_controller.h b/content/shell/browser/webkit_test_controller.h index aa181df..58d1fa9 100644 --- a/content/shell/webkit_test_controller.h +++ b/content/shell/browser/webkit_test_controller.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ -#define CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ +#ifndef CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ +#define CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ #include <ostream> #include <string> @@ -216,4 +216,4 @@ class WebKitTestController : public base::NonThreadSafe, } // namespace content -#endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ +#endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ diff --git a/content/shell/geolocation/shell_access_token_store.cc b/content/shell/geolocation/shell_access_token_store.cc index fa889bd..ceae3d6 100644 --- a/content/shell/geolocation/shell_access_token_store.cc +++ b/content/shell/geolocation/shell_access_token_store.cc @@ -8,7 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" -#include "content/shell/shell_browser_context.h" +#include "content/shell/browser/shell_browser_context.h" namespace content { |