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

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

Issue 10915226: OBSOLETE - Move drive.proto to browser/google_apis directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 3 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/drive_internals_ui.cc ('k') | chrome/chrome_browser.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/bind.h" 10 #include "base/bind.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "grit/locale_settings.h" 52 #include "grit/locale_settings.h"
53 #include "net/base/escape.h" 53 #include "net/base/escape.h"
54 #include "ui/base/resource/resource_bundle.h" 54 #include "ui/base/resource/resource_bundle.h"
55 55
56 #if defined(OS_CHROMEOS) 56 #if defined(OS_CHROMEOS)
57 #include "ash/shell.h" 57 #include "ash/shell.h"
58 #include "ash/shell_delegate.h" 58 #include "ash/shell_delegate.h"
59 #include "base/file_util.h" 59 #include "base/file_util.h"
60 #include "base/path_service.h" 60 #include "base/path_service.h"
61 #include "chrome/browser/chromeos/cros/cros_library.h" 61 #include "chrome/browser/chromeos/cros/cros_library.h"
62 #include "chrome/browser/chromeos/gdata/drive.pb.h"
63 #include "chrome/browser/chromeos/gdata/drive_file_system_interface.h" 62 #include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
64 #include "chrome/browser/chromeos/gdata/drive_file_system_util.h" 63 #include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
65 #include "chrome/browser/chromeos/gdata/drive_system_service.h" 64 #include "chrome/browser/chromeos/gdata/drive_system_service.h"
66 #include "chrome/browser/chromeos/login/user_manager.h" 65 #include "chrome/browser/chromeos/login/user_manager.h"
67 #include "chrome/browser/chromeos/system/syslogs_provider.h" 66 #include "chrome/browser/chromeos/system/syslogs_provider.h"
67 #include "chrome/browser/google_apis/drive.pb.h"
68 #include "ui/aura/root_window.h" 68 #include "ui/aura/root_window.h"
69 #include "ui/aura/window.h" 69 #include "ui/aura/window.h"
70 #endif 70 #endif
71 71
72 using content::BrowserThread; 72 using content::BrowserThread;
73 using content::WebContents; 73 using content::WebContents;
74 using content::WebUIMessageHandler; 74 using content::WebUIMessageHandler;
75 using ui::WebDialogUI; 75 using ui::WebDialogUI;
76 76
77 namespace { 77 namespace {
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 size_t sort_size = std::min(max_saved, screenshot_filepaths.size()); 747 size_t sort_size = std::min(max_saved, screenshot_filepaths.size());
748 std::partial_sort(screenshot_filepaths.begin(), 748 std::partial_sort(screenshot_filepaths.begin(),
749 screenshot_filepaths.begin() + sort_size, 749 screenshot_filepaths.begin() + sort_size,
750 screenshot_filepaths.end(), 750 screenshot_filepaths.end(),
751 ScreenshotTimestampComp); 751 ScreenshotTimestampComp);
752 for (size_t i = 0; i < sort_size; ++i) 752 for (size_t i = 0; i < sort_size; ++i)
753 saved_screenshots->push_back(std::string(kSavedScreenshotsUrl) + 753 saved_screenshots->push_back(std::string(kSavedScreenshotsUrl) +
754 screenshot_filepaths[i]); 754 screenshot_filepaths[i]);
755 } 755 }
756 #endif 756 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/drive_internals_ui.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698