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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 325963007: Do not append Google locale to help center links (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ash/system_tray_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 } 578 }
579 579
580 void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() { 580 void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {
581 ash::user::LoginStatus status = GetUserLoginStatus(); 581 ash::user::LoginStatus status = GetUserLoginStatus();
582 if (status == ash::user::LOGGED_IN_NONE || 582 if (status == ash::user::LOGGED_IN_NONE ||
583 status == ash::user::LOGGED_IN_LOCKED) { 583 status == ash::user::LOGGED_IN_LOCKED) {
584 scoped_refptr<chromeos::HelpAppLauncher> help_app( 584 scoped_refptr<chromeos::HelpAppLauncher> help_app(
585 new chromeos::HelpAppLauncher(GetNativeWindow())); 585 new chromeos::HelpAppLauncher(GetNativeWindow()));
586 help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE); 586 help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE);
587 } else { 587 } else {
588 GURL url(google_util::StringAppendGoogleLocaleParam( 588 GURL url(chrome::kLearnMoreEnterpriseURL);
Peter Kasting 2014/06/10 18:58:25 Nit: Could inline below
blundell 2014/06/11 12:07:19 Done.
589 chrome::kLearnMoreEnterpriseURL));
590 chrome::ScopedTabbedBrowserDisplayer displayer( 589 chrome::ScopedTabbedBrowserDisplayer displayer(
591 ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH); 590 ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
592 chrome::ShowSingletonTab(displayer.browser(), url); 591 chrome::ShowSingletonTab(displayer.browser(), url);
593 } 592 }
594 } 593 }
595 594
596 void SystemTrayDelegateChromeOS::ShowUserLogin() { 595 void SystemTrayDelegateChromeOS::ShowUserLogin() {
597 ash::Shell* shell = ash::Shell::GetInstance(); 596 ash::Shell* shell = ash::Shell::GetInstance();
598 if (!shell->delegate()->IsMultiProfilesEnabled()) 597 if (!shell->delegate()->IsMultiProfilesEnabled())
599 return; 598 return;
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
1404 accessibility_subscription_.reset(); 1403 accessibility_subscription_.reset();
1405 else 1404 else
1406 OnAccessibilityModeChanged(details.notify); 1405 OnAccessibilityModeChanged(details.notify);
1407 } 1406 }
1408 1407
1409 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1408 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1410 return new SystemTrayDelegateChromeOS(); 1409 return new SystemTrayDelegateChromeOS();
1411 } 1410 }
1412 1411
1413 } // namespace chromeos 1412 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698