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

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

Issue 10834194: Change email to be OPT-IN on Chrome and OPT-OUT on cros. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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/resources/feedback.js ('k') | no next file » | 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 <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 469
470 // Are screenshots disabled? 470 // Are screenshots disabled?
471 dialog_defaults.SetBoolean( 471 dialog_defaults.SetBoolean(
472 "disableScreenshots", 472 "disableScreenshots",
473 g_browser_process->local_state()->GetBoolean(prefs::kDisableScreenshots)); 473 g_browser_process->local_state()->GetBoolean(prefs::kDisableScreenshots));
474 474
475 // User e-mail 475 // User e-mail
476 std::string user_email = GetUserEmail(); 476 std::string user_email = GetUserEmail();
477 dialog_defaults.SetString("userEmail", user_email); 477 dialog_defaults.SetString("userEmail", user_email);
478 478
479 // Set email checkbox to checked by default for cros, unchecked for Chrome.
480 dialog_defaults.SetBoolean(
481 "emailCheckboxDefault",
482 #if defined(OS_CHROMEOS)
483 true);
484 #else
485 false);
486 #endif
487
488
479 #if defined(OS_CHROMEOS) 489 #if defined(OS_CHROMEOS)
480 // Trigger the request for system information here. 490 // Trigger the request for system information here.
481 chromeos::system::SyslogsProvider* provider = 491 chromeos::system::SyslogsProvider* provider =
482 chromeos::system::SyslogsProvider::GetInstance(); 492 chromeos::system::SyslogsProvider::GetInstance();
483 if (provider) { 493 if (provider) {
484 syslogs_handle_ = provider->RequestSyslogs( 494 syslogs_handle_ = provider->RequestSyslogs(
485 true, // don't compress. 495 true, // don't compress.
486 chromeos::system::SyslogsProvider::SYSLOGS_FEEDBACK, 496 chromeos::system::SyslogsProvider::SYSLOGS_FEEDBACK,
487 &syslogs_consumer_, 497 &syslogs_consumer_,
488 base::Bind(&FeedbackData::SyslogsComplete, 498 base::Bind(&FeedbackData::SyslogsComplete,
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 size_t sort_size = std::min(max_saved, screenshot_filepaths.size()); 684 size_t sort_size = std::min(max_saved, screenshot_filepaths.size());
675 std::partial_sort(screenshot_filepaths.begin(), 685 std::partial_sort(screenshot_filepaths.begin(),
676 screenshot_filepaths.begin() + sort_size, 686 screenshot_filepaths.begin() + sort_size,
677 screenshot_filepaths.end(), 687 screenshot_filepaths.end(),
678 ScreenshotTimestampComp); 688 ScreenshotTimestampComp);
679 for (size_t i = 0; i < sort_size; ++i) 689 for (size_t i = 0; i < sort_size; ++i)
680 saved_screenshots->push_back(std::string(kSavedScreenshotsUrl) + 690 saved_screenshots->push_back(std::string(kSavedScreenshotsUrl) +
681 screenshot_filepaths[i]); 691 screenshot_filepaths[i]);
682 } 692 }
683 #endif 693 #endif
OLDNEW
« no previous file with comments | « chrome/browser/resources/feedback.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698