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

Side by Side Diff: chrome/browser/first_run/first_run_win.cc

Issue 9371010: Make google_update.gyp write shared files to SHARED_INTERMEDIATE_DIR (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update DEPS Created 8 years, 10 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/browser/DEPS ('k') | chrome/browser/first_run/upgrade_util_win.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 "chrome/browser/first_run/first_run.h" 5 #include "chrome/browser/first_run/first_run.h"
6 6
7 #include <shlobj.h> 7 #include <shlobj.h>
8 #include <windows.h> 8 #include <windows.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 25 matching lines...) Expand all
36 #include "chrome/common/chrome_switches.h" 36 #include "chrome/common/chrome_switches.h"
37 #include "chrome/common/pref_names.h" 37 #include "chrome/common/pref_names.h"
38 #include "chrome/common/worker_thread_ticker.h" 38 #include "chrome/common/worker_thread_ticker.h"
39 #include "chrome/installer/util/browser_distribution.h" 39 #include "chrome/installer/util/browser_distribution.h"
40 #include "chrome/installer/util/install_util.h" 40 #include "chrome/installer/util/install_util.h"
41 #include "chrome/installer/util/master_preferences.h" 41 #include "chrome/installer/util/master_preferences.h"
42 #include "chrome/installer/util/shell_util.h" 42 #include "chrome/installer/util/shell_util.h"
43 #include "chrome/installer/util/util_constants.h" 43 #include "chrome/installer/util/util_constants.h"
44 #include "content/public/browser/notification_service.h" 44 #include "content/public/browser/notification_service.h"
45 #include "content/public/browser/user_metrics.h" 45 #include "content/public/browser/user_metrics.h"
46 #include "google_update_idl.h" 46 #include "google_update/google_update_idl.h"
47 #include "grit/chromium_strings.h" 47 #include "grit/chromium_strings.h"
48 #include "grit/generated_resources.h" 48 #include "grit/generated_resources.h"
49 #include "grit/locale_settings.h" 49 #include "grit/locale_settings.h"
50 #include "grit/theme_resources.h" 50 #include "grit/theme_resources.h"
51 #include "ui/base/resource/resource_bundle.h" 51 #include "ui/base/resource/resource_bundle.h"
52 #include "ui/base/ui_base_switches.h" 52 #include "ui/base/ui_base_switches.h"
53 53
54 using content::UserMetricsAction; 54 using content::UserMetricsAction;
55 55
56 namespace { 56 namespace {
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 484
485 FilePath MasterPrefsPath() { 485 FilePath MasterPrefsPath() {
486 // The standard location of the master prefs is next to the chrome binary. 486 // The standard location of the master prefs is next to the chrome binary.
487 FilePath master_prefs; 487 FilePath master_prefs;
488 if (!PathService::Get(base::DIR_EXE, &master_prefs)) 488 if (!PathService::Get(base::DIR_EXE, &master_prefs))
489 return FilePath(); 489 return FilePath();
490 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs); 490 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
491 } 491 }
492 492
493 } // namespace first_run 493 } // namespace first_run
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/first_run/upgrade_util_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698