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/feedback/feedback_data.h" | 5 #include "chrome/browser/feedback/feedback_data.h" |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/json/json_string_value_serializer.h" | 8 #include "base/json/json_string_value_serializer.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/chromeos/settings/cros_settings.h" | 12 #include "chrome/browser/chromeos/settings/cros_settings.h" |
13 #include "chrome/browser/feedback/feedback_util.h" | 13 #include "chrome/browser/feedback/feedback_util.h" |
14 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
16 | 16 |
17 #if defined(USE_ASH) | 17 #if defined(USE_ASH) |
18 #include "ash/shell.h" | 18 #include "ash/shell.h" |
19 #include "ash/shell_delegate.h" | 19 #include "ash/shell_delegate.h" |
20 #endif | 20 #endif |
21 | 21 |
22 #if defined(OS_CHROMEOS) | 22 #if defined(OS_CHROMEOS) |
23 #include "components/zip/zip.h" | 23 #include "third_party/zlib/google/zip.h" |
24 #endif | 24 #endif |
25 | 25 |
26 using content::BrowserThread; | 26 using content::BrowserThread; |
27 | 27 |
28 #if defined(OS_CHROMEOS) | 28 #if defined(OS_CHROMEOS) |
29 namespace { | 29 namespace { |
30 | 30 |
31 const char kLogsFilename[] = "system_logs.txt"; | 31 const char kLogsFilename[] = "system_logs.txt"; |
32 | 32 |
33 const char kMultilineIndicatorString[] = "<multiline>\n"; | 33 const char kMultilineIndicatorString[] = "<multiline>\n"; |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 } | 196 } |
197 | 197 |
198 // private | 198 // private |
199 void FeedbackData::ReadAttachedFile(const base::FilePath& from) { | 199 void FeedbackData::ReadAttachedFile(const base::FilePath& from) { |
200 if (!file_util::ReadFileToString(from, attached_filedata_.get())) { | 200 if (!file_util::ReadFileToString(from, attached_filedata_.get())) { |
201 if (attached_filedata_.get()) | 201 if (attached_filedata_.get()) |
202 attached_filedata_->clear(); | 202 attached_filedata_->clear(); |
203 } | 203 } |
204 } | 204 } |
205 #endif | 205 #endif |
OLD | NEW |