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

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

Issue 11299192: Ensure that Metro chrome in ASH is able to connect to an existing desktop chrome AURA process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 #if defined(ENABLE_CONFIGURATION_POLICY) 86 #if defined(ENABLE_CONFIGURATION_POLICY)
87 #include "chrome/browser/policy/browser_policy_connector.h" 87 #include "chrome/browser/policy/browser_policy_connector.h"
88 #else 88 #else
89 #include "chrome/browser/policy/policy_service_stub.h" 89 #include "chrome/browser/policy/policy_service_stub.h"
90 #endif // defined(ENABLE_CONFIGURATION_POLICY) 90 #endif // defined(ENABLE_CONFIGURATION_POLICY)
91 91
92 #if defined(OS_WIN) 92 #if defined(OS_WIN)
93 #include "base/win/windows_version.h" 93 #include "base/win/windows_version.h"
94 #include "ui/views/focus/view_storage.h" 94 #include "ui/views/focus/view_storage.h"
95 #if defined(USE_AURA)
96 #include "chrome/browser/metro_viewer/metro_viewer_process_host_win.h"
97 #endif
95 #elif defined(OS_MACOSX) 98 #elif defined(OS_MACOSX)
96 #include "chrome/browser/chrome_browser_main_mac.h" 99 #include "chrome/browser/chrome_browser_main_mac.h"
97 #endif 100 #endif
98 101
99 #if defined(USE_AURA) 102 #if defined(USE_AURA)
100 #include "ui/aura/env.h" 103 #include "ui/aura/env.h"
101 #endif 104 #endif
102 105
103 #if defined(OS_CHROMEOS) 106 #if defined(OS_CHROMEOS)
104 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" 107 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 } 567 }
565 568
566 BookmarkPromptController* BrowserProcessImpl::bookmark_prompt_controller() { 569 BookmarkPromptController* BrowserProcessImpl::bookmark_prompt_controller() {
567 #if defined(OS_ANDROID) 570 #if defined(OS_ANDROID)
568 return NULL; 571 return NULL;
569 #else 572 #else
570 return bookmark_prompt_controller_.get(); 573 return bookmark_prompt_controller_.get();
571 #endif 574 #endif
572 } 575 }
573 576
577 #if !defined(OS_WIN)
578 void BrowserProcessImpl::PlatformSpecificCommandLineProcessing(
579 const CommandLine& command_line) {
580 }
581 #endif
582
574 DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() { 583 DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
575 DCHECK(CalledOnValidThread()); 584 DCHECK(CalledOnValidThread());
576 if (!download_request_limiter_) 585 if (!download_request_limiter_)
577 download_request_limiter_ = new DownloadRequestLimiter(); 586 download_request_limiter_ = new DownloadRequestLimiter();
578 return download_request_limiter_; 587 return download_request_limiter_;
579 } 588 }
580 589
581 BackgroundModeManager* BrowserProcessImpl::background_mode_manager() { 590 BackgroundModeManager* BrowserProcessImpl::background_mode_manager() {
582 DCHECK(CalledOnValidThread()); 591 DCHECK(CalledOnValidThread());
583 #if defined(ENABLE_BACKGROUND) 592 #if defined(ENABLE_BACKGROUND)
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 } 957 }
949 958
950 void BrowserProcessImpl::OnAutoupdateTimer() { 959 void BrowserProcessImpl::OnAutoupdateTimer() {
951 if (CanAutorestartForUpdate()) { 960 if (CanAutorestartForUpdate()) {
952 DLOG(WARNING) << "Detected update. Restarting browser."; 961 DLOG(WARNING) << "Detected update. Restarting browser.";
953 RestartBackgroundInstance(); 962 RestartBackgroundInstance();
954 } 963 }
955 } 964 }
956 965
957 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 966 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698