summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_main_runner.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 18:44:52 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 18:44:52 +0000
commit7a91c555f3e057f8be9010a4e5385678ce822c28 (patch)
treeedb8a4384b09b3ce70b6b58a17afe5470eb5e039 /content/browser/browser_main_runner.cc
parente2e22a7ab44c2f49d856a9f840893c5462f52679 (diff)
downloadchromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.zip
chromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.tar.gz
chromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.tar.bz2
content/browser: Move more files into the content namespace.
Fixed most of the files found with the following command line: $ git grep --files-without-match --name-only "namespace content {" -- content/browser/{*.cc,*.h.*.mm} R=jam@chromium.org Review URL: https://codereview.chromium.org/11274038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_runner.cc')
-rw-r--r--content/browser/browser_main_runner.cc16
1 files changed, 7 insertions, 9 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 061c7d4..3fa9afea 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -29,11 +29,11 @@
bool g_exited_main_message_loop = false;
-using content::ChildProcess;
+namespace content {
namespace {
-class BrowserMainRunnerImpl : public content::BrowserMainRunner {
+class BrowserMainRunnerImpl : public BrowserMainRunner {
public:
BrowserMainRunnerImpl()
: is_initialized_(false),
@@ -46,7 +46,7 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
Shutdown();
}
- virtual int Initialize(const content::MainFunctionParams& parameters)
+ virtual int Initialize(const MainFunctionParams& parameters)
OVERRIDE {
is_initialized_ = true;
@@ -69,7 +69,7 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
notification_service_.reset(new NotificationServiceImpl);
- main_loop_.reset(new content::BrowserMainLoop(parameters));
+ main_loop_.reset(new BrowserMainLoop(parameters));
main_loop_->Init();
@@ -98,8 +98,8 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
#endif // OS_WIN
#if defined(OS_ANDROID)
- content::SurfaceTexturePeer::InitInstance(
- new content::SurfaceTexturePeerBrowserImpl(
+ SurfaceTexturePeer::InitInstance(
+ new SurfaceTexturePeerBrowserImpl(
parameters.command_line.HasSwitch(
switches::kMediaPlayerInRenderProcess)));
#endif
@@ -153,7 +153,7 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
bool created_threads_;
scoped_ptr<NotificationServiceImpl> notification_service_;
- scoped_ptr<content::BrowserMainLoop> main_loop_;
+ scoped_ptr<BrowserMainLoop> main_loop_;
#if defined(OS_WIN)
scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
#endif
@@ -163,8 +163,6 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
} // namespace
-namespace content {
-
// static
BrowserMainRunner* BrowserMainRunner::Create() {
return new BrowserMainRunnerImpl();