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

Unified Diff: extensions/shell/browser/shell_content_browser_client.h

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 40% Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/shell/browser/shell_content_browser_client.h
diff --git a/apps/shell/browser/shell_content_browser_client.h b/extensions/shell/browser/shell_content_browser_client.h
similarity index 82%
rename from apps/shell/browser/shell_content_browser_client.h
rename to extensions/shell/browser/shell_content_browser_client.h
index 984dd6f7ed37e9a60c170b212ac1e14c9809c70b..1e08527707a61af3e0222170c79c24443e9a4d9a 100644
--- a/apps/shell/browser/shell_content_browser_client.h
+++ b/extensions/shell/browser/shell_content_browser_client.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 APPS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
-#define APPS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
+#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
+#define EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
#include "base/compiler_specific.h"
#include "content/public/browser/content_browser_client.h"
@@ -16,9 +16,6 @@ class BrowserContext;
namespace extensions {
class Extension;
-}
-
-namespace apps {
class ShellBrowserMainDelegate;
class ShellBrowserMainParts;
@@ -49,10 +46,10 @@ class ShellContentBrowserClient : public content::ContentBrowserClient {
// TODO(jamescook): Quota management?
// TODO(jamescook): Speech recognition?
virtual bool IsHandledURL(const GURL& url) OVERRIDE;
- virtual void SiteInstanceGotProcess(content::SiteInstance* site_instance)
- OVERRIDE;
- virtual void SiteInstanceDeleting(content::SiteInstance* site_instance)
- OVERRIDE;
+ virtual void SiteInstanceGotProcess(
+ content::SiteInstance* site_instance) OVERRIDE;
+ virtual void SiteInstanceDeleting(
+ content::SiteInstance* site_instance) OVERRIDE;
virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
int child_process_id) OVERRIDE;
virtual void GetAdditionalAllowedSchemesForFileSystem(
@@ -60,8 +57,7 @@ class ShellContentBrowserClient : public content::ContentBrowserClient {
private:
// Returns the extension or app associated with |site_instance| or NULL.
- const extensions::Extension* GetExtension(
- content::SiteInstance* site_instance);
+ const Extension* GetExtension(content::SiteInstance* site_instance);
// Owned by content::BrowserMainLoop.
ShellBrowserMainParts* browser_main_parts_;
@@ -72,6 +68,6 @@ class ShellContentBrowserClient : public content::ContentBrowserClient {
DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient);
};
-} // namespace apps
+} // namespace extensions
-#endif // APPS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
+#endif // EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
« no previous file with comments | « extensions/shell/browser/shell_browsertest.cc ('k') | extensions/shell/browser/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698