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

Side by Side Diff: chrome/app/client_util.cc

Issue 6672070: Move the remaining files in chrome\common to content\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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
« no previous file with comments | « chrome/app/chrome_main.cc ('k') | chrome/app/dummy_main_functions.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <windows.h> 5 #include <windows.h>
6 #include <shlwapi.h> 6 #include <shlwapi.h>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/win/registry.h" 13 #include "base/win/registry.h"
14 #include "base/scoped_ptr.h" 14 #include "base/scoped_ptr.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "base/version.h" 17 #include "base/version.h"
18 #include "chrome/app/breakpad_win.h" 18 #include "chrome/app/breakpad_win.h"
19 #include "chrome/app/client_util.h" 19 #include "chrome/app/client_util.h"
20 #include "chrome/common/chrome_constants.h" 20 #include "chrome/common/chrome_constants.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/result_codes.h"
23 #include "chrome/installer/util/browser_distribution.h" 22 #include "chrome/installer/util/browser_distribution.h"
24 #include "chrome/installer/util/channel_info.h" 23 #include "chrome/installer/util/channel_info.h"
25 #include "chrome/installer/util/install_util.h" 24 #include "chrome/installer/util/install_util.h"
26 #include "chrome/installer/util/google_update_constants.h" 25 #include "chrome/installer/util/google_update_constants.h"
27 #include "chrome/installer/util/util_constants.h" 26 #include "chrome/installer/util/util_constants.h"
27 #include "content/common/result_codes.h"
28 28
29 namespace { 29 namespace {
30 // The entry point signature of chrome.dll. 30 // The entry point signature of chrome.dll.
31 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*, wchar_t*); 31 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*, wchar_t*);
32 32
33 typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)(); 33 typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)();
34 34
35 // Gets chrome version according to the load path. |exe_path| must be the 35 // Gets chrome version according to the load path. |exe_path| must be the
36 // backslash terminated directory of the current chrome.exe. 36 // backslash terminated directory of the current chrome.exe.
37 bool GetVersion(const wchar_t* exe_path, const wchar_t* key_path, 37 bool GetVersion(const wchar_t* exe_path, const wchar_t* key_path,
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 } 338 }
339 }; 339 };
340 340
341 MainDllLoader* MakeMainDllLoader() { 341 MainDllLoader* MakeMainDllLoader() {
342 #if defined(GOOGLE_CHROME_BUILD) 342 #if defined(GOOGLE_CHROME_BUILD)
343 return new ChromeDllLoader(); 343 return new ChromeDllLoader();
344 #else 344 #else
345 return new ChromiumDllLoader(); 345 return new ChromiumDllLoader();
346 #endif 346 #endif
347 } 347 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main.cc ('k') | chrome/app/dummy_main_functions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698