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

Side by Side Diff: content/shell/shell_browser_main_parts.cc

Issue 11614037: Call ShowRootWindow on NativeWindow's RootWindow to display the window. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Fix mac build failure Created 7 years, 11 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 unified diff | Download patch
« no previous file with comments | « content/shell/shell_aura.cc ('k') | content/shell/shell_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/shell_browser_main_parts.h" 5 #include "content/shell/shell_browser_main_parts.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 #if defined(OS_ANDROID) 99 #if defined(OS_ANDROID)
100 net::NetworkChangeNotifier::SetFactory( 100 net::NetworkChangeNotifier::SetFactory(
101 new net::NetworkChangeNotifierFactoryAndroid()); 101 new net::NetworkChangeNotifierFactoryAndroid());
102 #endif 102 #endif
103 } 103 }
104 104
105 void ShellBrowserMainParts::PreMainMessageLoopRun() { 105 void ShellBrowserMainParts::PreMainMessageLoopRun() {
106 browser_context_.reset(new ShellBrowserContext(false)); 106 browser_context_.reset(new ShellBrowserContext(false));
107 off_the_record_browser_context_.reset(new ShellBrowserContext(true)); 107 off_the_record_browser_context_.reset(new ShellBrowserContext(true));
108 108
109 Shell::PlatformInitialize(); 109 Shell::Initialize();
110 net::NetModule::SetResourceProvider(PlatformResourceProvider); 110 net::NetModule::SetResourceProvider(PlatformResourceProvider);
111 111
112 int port = 0; 112 int port = 0;
113 // On android the port number isn't used. 113 // On android the port number isn't used.
114 #if !defined(OS_ANDROID) 114 #if !defined(OS_ANDROID)
115 // See if the user specified a port on the command line (useful for 115 // See if the user specified a port on the command line (useful for
116 // automation). If not, use an ephemeral port by specifying 0. 116 // automation). If not, use an ephemeral port by specifying 0.
117 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 117 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
118 if (command_line.HasSwitch(switches::kRemoteDebuggingPort)) { 118 if (command_line.HasSwitch(switches::kRemoteDebuggingPort)) {
119 int temp_port; 119 int temp_port;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 #if defined(USE_AURA) 152 #if defined(USE_AURA)
153 Shell::PlatformExit(); 153 Shell::PlatformExit();
154 #endif 154 #endif
155 if (devtools_delegate_) 155 if (devtools_delegate_)
156 devtools_delegate_->Stop(); 156 devtools_delegate_->Stop();
157 browser_context_.reset(); 157 browser_context_.reset();
158 off_the_record_browser_context_.reset(); 158 off_the_record_browser_context_.reset();
159 } 159 }
160 160
161 } // namespace 161 } // namespace
OLDNEW
« no previous file with comments | « content/shell/shell_aura.cc ('k') | content/shell/shell_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698