| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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_main.h" | 5 #include "chrome/browser/browser_main.h" |
| 6 #include "chrome/browser/browser_main_win.h" | 6 #include "chrome/browser/browser_main_win.h" |
| 7 | 7 |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 | 10 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "grit/chromium_strings.h" | 26 #include "grit/chromium_strings.h" |
| 27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
| 28 #include "views/focus/accelerator_handler.h" | 28 #include "views/focus/accelerator_handler.h" |
| 29 #include "views/window/window.h" | 29 #include "views/window/window.h" |
| 30 | 30 |
| 31 namespace Platform { | 31 namespace Platform { |
| 32 | 32 |
| 33 void WillInitializeMainMessageLoop(const MainFunctionParams& parameters) { | 33 void WillInitializeMainMessageLoop(const MainFunctionParams& parameters) { |
| 34 } | 34 } |
| 35 | 35 |
| 36 void WillTerminate() { | 36 void DidEndMainMessageLoop() { |
| 37 } | 37 } |
| 38 | 38 |
| 39 void RecordBreakpadStatusUMA(MetricsService* metrics) { | 39 void RecordBreakpadStatusUMA(MetricsService* metrics) { |
| 40 DWORD len = ::GetEnvironmentVariableW(env_vars::kNoOOBreakpad, NULL, 0); | 40 DWORD len = ::GetEnvironmentVariableW(env_vars::kNoOOBreakpad, NULL, 0); |
| 41 metrics->RecordBreakpadRegistration((len == 0)); | 41 metrics->RecordBreakpadRegistration((len == 0)); |
| 42 metrics->RecordBreakpadHasDebugger(TRUE == ::IsDebuggerPresent()); | 42 metrics->RecordBreakpadHasDebugger(TRUE == ::IsDebuggerPresent()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 } // namespace Platform | 45 } // namespace Platform |
| 46 | 46 |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 bool DoUpgradeTasks(const CommandLine& command_line) { | 202 bool DoUpgradeTasks(const CommandLine& command_line) { |
| 203 if (!Upgrade::SwapNewChromeExeIfPresent()) | 203 if (!Upgrade::SwapNewChromeExeIfPresent()) |
| 204 return false; | 204 return false; |
| 205 // At this point the chrome.exe has been swapped with the new one. | 205 // At this point the chrome.exe has been swapped with the new one. |
| 206 if (!Upgrade::RelaunchChromeBrowser(command_line)) { | 206 if (!Upgrade::RelaunchChromeBrowser(command_line)) { |
| 207 // The re-launch fails. Feel free to panic now. | 207 // The re-launch fails. Feel free to panic now. |
| 208 NOTREACHED(); | 208 NOTREACHED(); |
| 209 } | 209 } |
| 210 return true; | 210 return true; |
| 211 } | 211 } |
| OLD | NEW |