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

Side by Side Diff: chrome/common/url_constants.cc

Issue 225523004: Updates the UI and reenables the fix introduced in commit 256939 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes a problem related to browser tests and rebased to latest source Created 6 years, 8 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
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/common/url_constants.h" 5 #include "chrome/common/url_constants.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "content/public/common/url_constants.h" 10 #include "content/public/common/url_constants.h"
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 const char kSyncEncryptionHelpURL[] = 528 const char kSyncEncryptionHelpURL[] =
529 #if defined(OS_CHROMEOS) 529 #if defined(OS_CHROMEOS)
530 "https://support.google.com/chromeos/?p=settings_encryption"; 530 "https://support.google.com/chromeos/?p=settings_encryption";
531 #else 531 #else
532 "https://support.google.com/chrome/?p=settings_encryption"; 532 "https://support.google.com/chrome/?p=settings_encryption";
533 #endif 533 #endif
534 534
535 const char kSyncErrorsHelpURL[] = 535 const char kSyncErrorsHelpURL[] =
536 "https://support.google.com/chrome/?p=settings_sync_error"; 536 "https://support.google.com/chrome/?p=settings_sync_error";
537 537
538 const char kEnterpriseManagedAccountHelpURL[] =
539 "https://support.google.com/chromebook/answer/1331549";
540
541 #if defined(OS_CHROMEOS) 538 #if defined(OS_CHROMEOS)
542 const char kNaturalScrollHelpURL[] = 539 const char kNaturalScrollHelpURL[] =
543 "https://support.google.com/chromeos/?p=simple_scrolling"; 540 "https://support.google.com/chromeos/?p=simple_scrolling";
544 #endif 541 #endif
545 542
546 #if defined(OS_CHROMEOS) 543 #if defined(OS_CHROMEOS)
547 const char kLearnMoreEnterpriseURL[] = 544 const char kLearnMoreEnterpriseURL[] =
548 "https://support.google.com/chromeos/bin/answer.py?answer=2535613"; 545 "https://support.google.com/chromeos/bin/answer.py?answer=2535613";
549 #endif 546 #endif
550 547
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 ""; 708 "";
712 #endif 709 #endif
713 #endif 710 #endif
714 711
715 // TODO(tengs): Replace with real URL when ready. 712 // TODO(tengs): Replace with real URL when ready.
716 const char kEasyUnlockLearnMoreUrl[] = 713 const char kEasyUnlockLearnMoreUrl[] =
717 "https://support.google.com/chromebook/?p=easy_unlock"; 714 "https://support.google.com/chromebook/?p=easy_unlock";
718 const char kEasyUnlockManagementUrl[] = "https://chrome.com"; 715 const char kEasyUnlockManagementUrl[] = "https://chrome.com";
719 716
720 } // namespace chrome 717 } // namespace chrome
OLDNEW
« chrome/browser/ui/webui/options/manage_profile_handler.cc ('K') | « chrome/common/url_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698