OLD | NEW |
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/mac/install_from_dmg.h" | 5 #include "chrome/browser/mac/install_from_dmg.h" |
6 | 6 |
7 #import <AppKit/AppKit.h> | 7 #import <AppKit/AppKit.h> |
8 #include <ApplicationServices/ApplicationServices.h> | 8 #include <ApplicationServices/ApplicationServices.h> |
9 #include <CoreFoundation/CoreFoundation.h> | 9 #include <CoreFoundation/CoreFoundation.h> |
10 #include <CoreServices/CoreServices.h> | 10 #include <CoreServices/CoreServices.h> |
(...skipping 23 matching lines...) Expand all Loading... |
34 #include "base/strings/string_util.h" | 34 #include "base/strings/string_util.h" |
35 #include "base/strings/stringprintf.h" | 35 #include "base/strings/stringprintf.h" |
36 #include "base/strings/sys_string_conversions.h" | 36 #include "base/strings/sys_string_conversions.h" |
37 #include "chrome/browser/mac/dock.h" | 37 #include "chrome/browser/mac/dock.h" |
38 #import "chrome/browser/mac/keystone_glue.h" | 38 #import "chrome/browser/mac/keystone_glue.h" |
39 #include "chrome/browser/mac/relauncher.h" | 39 #include "chrome/browser/mac/relauncher.h" |
40 #include "chrome/common/chrome_constants.h" | 40 #include "chrome/common/chrome_constants.h" |
41 #include "chrome/common/chrome_switches.h" | 41 #include "chrome/common/chrome_switches.h" |
42 #include "chrome/grit/chromium_strings.h" | 42 #include "chrome/grit/chromium_strings.h" |
43 #include "chrome/grit/generated_resources.h" | 43 #include "chrome/grit/generated_resources.h" |
44 #include "grit/components_strings.h" | 44 #include "components/strings/grit/components_strings.h" |
45 #include "ui/base/l10n/l10n_util.h" | 45 #include "ui/base/l10n/l10n_util.h" |
46 #include "ui/base/l10n/l10n_util_mac.h" | 46 #include "ui/base/l10n/l10n_util_mac.h" |
47 | 47 |
48 // When C++ exceptions are disabled, the C++ library defines |try| and | 48 // When C++ exceptions are disabled, the C++ library defines |try| and |
49 // |catch| so as to allow exception-expecting C++ code to build properly when | 49 // |catch| so as to allow exception-expecting C++ code to build properly when |
50 // language support for exceptions is not present. These macros interfere | 50 // language support for exceptions is not present. These macros interfere |
51 // with the use of |@try| and |@catch| in Objective-C files such as this one. | 51 // with the use of |@try| and |@catch| in Objective-C files such as this one. |
52 // Undefine these macros here, after everything has been #included, since | 52 // Undefine these macros here, after everything has been #included, since |
53 // there will be no C++ uses and only Objective-C uses from this point on. | 53 // there will be no C++ uses and only Objective-C uses from this point on. |
54 #undef try | 54 #undef try |
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
699 const UInt8* trash_path_u8 = reinterpret_cast<const UInt8*>( | 699 const UInt8* trash_path_u8 = reinterpret_cast<const UInt8*>( |
700 trash_path.value().c_str()); | 700 trash_path.value().c_str()); |
701 status = FNNotifyByPath(trash_path_u8, | 701 status = FNNotifyByPath(trash_path_u8, |
702 kFNDirectoryModifiedMessage, | 702 kFNDirectoryModifiedMessage, |
703 kNilOptions); | 703 kNilOptions); |
704 if (status != noErr) { | 704 if (status != noErr) { |
705 OSSTATUS_LOG(ERROR, status) << "FNNotifyByPath"; | 705 OSSTATUS_LOG(ERROR, status) << "FNNotifyByPath"; |
706 return; | 706 return; |
707 } | 707 } |
708 } | 708 } |
OLD | NEW |