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

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include in chrome_shell_delegate.cc Created 6 years, 3 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 | Annotate | Revision Log
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 "chrome/browser/browser_process_impl.h" 5 #include "chrome/browser/browser_process_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 193
194 #if defined(OS_MACOSX) 194 #if defined(OS_MACOSX)
195 InitIdleMonitor(); 195 InitIdleMonitor();
196 #endif 196 #endif
197 197
198 #if !defined(OS_ANDROID) 198 #if !defined(OS_ANDROID)
199 device_client_.reset(new ChromeDeviceClient); 199 device_client_.reset(new ChromeDeviceClient);
200 #endif 200 #endif
201 201
202 #if defined(ENABLE_EXTENSIONS) 202 #if defined(ENABLE_EXTENSIONS)
203 apps::AppsClient::Set(ChromeAppsClient::GetInstance()); 203 extensions::AppsClient::Set(ChromeAppsClient::GetInstance());
204 204
205 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; 205 extension_event_router_forwarder_ = new extensions::EventRouterForwarder;
206 ExtensionRendererState::GetInstance()->Init(); 206 ExtensionRendererState::GetInstance()->Init();
207 207
208 extensions::ExtensionsClient::Set( 208 extensions::ExtensionsClient::Set(
209 extensions::ChromeExtensionsClient::GetInstance()); 209 extensions::ChromeExtensionsClient::GetInstance());
210 210
211 extensions_browser_client_.reset( 211 extensions_browser_client_.reset(
212 new extensions::ChromeExtensionsBrowserClient); 212 new extensions::ChromeExtensionsBrowserClient);
213 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get()); 213 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
(...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after
1217 } 1217 }
1218 1218
1219 void BrowserProcessImpl::OnAutoupdateTimer() { 1219 void BrowserProcessImpl::OnAutoupdateTimer() {
1220 if (CanAutorestartForUpdate()) { 1220 if (CanAutorestartForUpdate()) {
1221 DLOG(WARNING) << "Detected update. Restarting browser."; 1221 DLOG(WARNING) << "Detected update. Restarting browser.";
1222 RestartBackgroundInstance(); 1222 RestartBackgroundInstance();
1223 } 1223 }
1224 } 1224 }
1225 1225
1226 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1226 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/apps/web_view_interactive_browsertest.cc ('k') | chrome/browser/chromeos/app_mode/app_session_lifetime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698