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

Side by Side Diff: chrome/browser/ui/webui/feedback_ui.cc

Issue 22532012: Use scrubbed logs for sending with feedback reports. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/system_info_ui.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('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/ui/webui/feedback_ui.h" 5 #include "chrome/browser/ui/webui/feedback_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #if defined(OS_CHROMEOS) 58 #if defined(OS_CHROMEOS)
59 #include "ash/shell.h" 59 #include "ash/shell.h"
60 #include "ash/shell_delegate.h" 60 #include "ash/shell_delegate.h"
61 #include "base/file_util.h" 61 #include "base/file_util.h"
62 #include "base/path_service.h" 62 #include "base/path_service.h"
63 #include "chrome/browser/chromeos/drive/drive.pb.h" 63 #include "chrome/browser/chromeos/drive/drive.pb.h"
64 #include "chrome/browser/chromeos/drive/drive_integration_service.h" 64 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
65 #include "chrome/browser/chromeos/drive/file_system_interface.h" 65 #include "chrome/browser/chromeos/drive/file_system_interface.h"
66 #include "chrome/browser/chromeos/drive/file_system_util.h" 66 #include "chrome/browser/chromeos/drive/file_system_util.h"
67 #include "chrome/browser/chromeos/login/user_manager.h" 67 #include "chrome/browser/chromeos/login/user_manager.h"
68 #include "chrome/browser/chromeos/system_logs/system_logs_fetcher.h" 68 #include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
69 #include "ui/aura/root_window.h" 69 #include "ui/aura/root_window.h"
70 #include "ui/aura/window.h" 70 #include "ui/aura/window.h"
71 #endif 71 #endif
72 72
73 using content::BrowserThread; 73 using content::BrowserThread;
74 using content::WebContents; 74 using content::WebContents;
75 using content::WebUIMessageHandler; 75 using content::WebUIMessageHandler;
76 using ui::WebDialogUI; 76 using ui::WebDialogUI;
77 77
78 namespace { 78 namespace {
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 screenshot_filepaths.begin() + sort_size, 718 screenshot_filepaths.begin() + sort_size,
719 screenshot_filepaths.end(), 719 screenshot_filepaths.end(),
720 ScreenshotTimestampComp); 720 ScreenshotTimestampComp);
721 for (size_t i = 0; i < sort_size; ++i) 721 for (size_t i = 0; i < sort_size; ++i)
722 saved_screenshots->push_back( 722 saved_screenshots->push_back(
723 std::string(ScreenshotSource::kScreenshotUrlRoot) + 723 std::string(ScreenshotSource::kScreenshotUrlRoot) +
724 std::string(ScreenshotSource::kScreenshotSaved) + 724 std::string(ScreenshotSource::kScreenshotSaved) +
725 screenshot_filepaths[i]); 725 screenshot_filepaths[i]);
726 } 726 }
727 #endif 727 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/system_info_ui.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698