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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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/shell_integration.h" 5 #include "chrome/browser/shell_integration.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
11 #include "base/prefs/pref_service.h"
12 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
13 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
14 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
15 #include "base/threading/thread_restrictions.h" 14 #include "base/threading/thread_restrictions.h"
16 #include "base/timer/timer.h" 15 #include "base/timer/timer.h"
17 #include "build/build_config.h" 16 #include "build/build_config.h"
18 #include "chrome/browser/policy/policy_path_parser.h" 17 #include "chrome/browser/policy/policy_path_parser.h"
19 #include "chrome/common/chrome_paths.h" 18 #include "chrome/common/chrome_paths.h"
20 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "components/prefs/pref_service.h"
21 #include "components/version_info/version_info.h" 21 #include "components/version_info/version_info.h"
22 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
23 23
24 #if defined(OS_CHROMEOS) 24 #if defined(OS_CHROMEOS)
25 #include "chromeos/chromeos_switches.h" 25 #include "chromeos/chromeos_switches.h"
26 #endif 26 #endif
27 27
28 #if !defined(OS_WIN) 28 #if !defined(OS_WIN)
29 #include "chrome/common/channel_info.h" 29 #include "chrome/common/channel_info.h"
30 #include "chrome/grit/chromium_strings.h" 30 #include "chrome/grit/chromium_strings.h"
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 BrowserThread::PostTask( 489 BrowserThread::PostTask(
490 BrowserThread::UI, FROM_HERE, 490 BrowserThread::UI, FROM_HERE,
491 base::Bind(&DefaultProtocolClientWorker::OnSetAsDefaultAttemptComplete, 491 base::Bind(&DefaultProtocolClientWorker::OnSetAsDefaultAttemptComplete,
492 this, result)); 492 this, result));
493 } 493 }
494 494
495 const char* 495 const char*
496 ShellIntegration::DefaultProtocolClientWorker::GetHistogramPrefix() { 496 ShellIntegration::DefaultProtocolClientWorker::GetHistogramPrefix() {
497 return "DefaultProtocolClient"; 497 return "DefaultProtocolClient";
498 } 498 }
OLDNEW
« no previous file with comments | « chrome/browser/sessions/session_restore_browsertest_chromeos.cc ('k') | chrome/browser/signin/chrome_proximity_auth_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698