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

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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
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/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/threading/thread_restrictions.h" 14 #include "base/threading/thread_restrictions.h"
15 #include "chrome/browser/policy/policy_path_parser.h" 15 #include "chrome/browser/policy/policy_path_parser.h"
16 #include "chrome/common/chrome_paths.h" 16 #include "chrome/common/chrome_paths.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 20
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 #include "chromeos/chromeos_switches.h" 22 #include "chromeos/chromeos_switches.h"
23 #endif 23 #endif
24 24
25 #if !defined(OS_WIN) 25 #if !defined(OS_WIN)
26 #include "chrome/common/chrome_version_info.h" 26 #include "chrome/common/chrome_version_info.h"
27 #include "grit/chromium_strings.h" 27 #include "chrome/grit/chromium_strings.h"
28 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
29 #endif 29 #endif
30 30
31 using content::BrowserThread; 31 using content::BrowserThread;
32 32
33 ShellIntegration::DefaultWebClientSetPermission 33 ShellIntegration::DefaultWebClientSetPermission
34 ShellIntegration::CanSetAsDefaultProtocolClient() { 34 ShellIntegration::CanSetAsDefaultProtocolClient() {
35 // Allowed as long as the browser can become the operating system default 35 // Allowed as long as the browser can become the operating system default
36 // browser. 36 // browser.
37 return CanSetAsDefaultBrowser(); 37 return CanSetAsDefaultBrowser();
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 case ShellIntegration::SET_DEFAULT_INTERACTIVE: 308 case ShellIntegration::SET_DEFAULT_INTERACTIVE:
309 if (interactive_permitted) { 309 if (interactive_permitted) {
310 result = ShellIntegration::SetAsDefaultProtocolClientInteractive( 310 result = ShellIntegration::SetAsDefaultProtocolClientInteractive(
311 protocol_); 311 protocol_);
312 } 312 }
313 break; 313 break;
314 } 314 }
315 315
316 return result; 316 return result;
317 } 317 }
OLDNEW
« no previous file with comments | « chrome/browser/services/gcm/push_messaging_infobar_delegate.cc ('k') | chrome/browser/signin/signin_error_notifier_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698