diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 19:57:05 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 19:57:05 +0000 |
| commit | 16320ea7fee687b6642f8d9d00a2624f4920bc2e (patch) | |
| tree | 5c2ad7861807002f605d3aebed1b8c9dd095513e /chrome/app | |
| parent | e121969dd45f75c4a8c09e8cca254f89375ec377 (diff) | |
| download | chromium_src-16320ea7fee687b6642f8d9d00a2624f4920bc2e.zip chromium_src-16320ea7fee687b6642f8d9d00a2624f4920bc2e.tar.gz chromium_src-16320ea7fee687b6642f8d9d00a2624f4920bc2e.tar.bz2 | |
Move ContentMainDelegate to content/public/.
Mostly a trivial move since the implementation for the class (now
deleted) was do-nothing and the only subclass that didn't have a full
implementation was ShellMainDelegate.
BUG=98716
TEST=it builds + existing tests
Review URL: http://codereview.chromium.org/8356025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/DEPS | 3 | ||||
| -rw-r--r-- | chrome/app/chrome_main_delegate.cc | 2 | ||||
| -rw-r--r-- | chrome/app/chrome_main_delegate.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/chrome/app/DEPS b/chrome/app/DEPS index 9525520..d9f9aee 100644 --- a/chrome/app/DEPS +++ b/chrome/app/DEPS @@ -5,7 +5,8 @@ include_rules = [ "+chrome/plugin/chrome_content_plugin_client.h", "+chrome/renderer/chrome_content_renderer_client.h", "+chrome/utility/chrome_content_utility_client.h", - "+content/app", + "+content/app", # TODO(joi): Remove once content API in place. + "+content/public/app", "+content/browser/renderer_host/render_process_host.h", "+grit", # For generated headers "+media/base", # For initializing media library. diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index cfdeb46..1007f00 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -30,10 +30,10 @@ #include "chrome/renderer/chrome_content_renderer_client.h" #include "chrome/utility/chrome_content_utility_client.h" #include "content/app/content_main.h" -#include "content/app/content_main_delegate.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/common/content_counters.h" #include "content/common/content_paths.h" +#include "content/public/app/content_main_delegate.h" #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "media/base/media.h" diff --git a/chrome/app/chrome_main_delegate.h b/chrome/app/chrome_main_delegate.h index 978f574..f0a6fe9 100644 --- a/chrome/app/chrome_main_delegate.h +++ b/chrome/app/chrome_main_delegate.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/stats_counters.h" #include "chrome/common/chrome_content_client.h" -#include "content/app/content_main_delegate.h" +#include "content/public/app/content_main_delegate.h" // Chrome implementation of ContentMainDelegate. class ChromeMainDelegate : public content::ContentMainDelegate { |