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

Unified Diff: chrome/browser/ui/panels/panel_manager.cc

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel_manager.cc
diff --git a/chrome/browser/ui/panels/panel_manager.cc b/chrome/browser/ui/panels/panel_manager.cc
index 41e32ffc3bb992f20e81f6a9db980c5b8f10fc53..d3c5f06d45c0f776ac262e083e077009071b80a0 100644
--- a/chrome/browser/ui/panels/panel_manager.cc
+++ b/chrome/browser/ui/panels/panel_manager.cc
@@ -105,7 +105,8 @@ void PanelManager::SetDisplaySettingsProviderForTesting(
bool PanelManager::ShouldUsePanels(const std::string& extension_id) {
#if defined(USE_X11) && !defined(OS_CHROMEOS)
// If --enable-panels is on, always use panels on Linux.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePanels))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnablePanels))
return true;
// Otherwise, panels are only supported on tested window managers.
@@ -124,12 +125,12 @@ bool PanelManager::ShouldUsePanels(const std::string& extension_id) {
chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
channel == chrome::VersionInfo::CHANNEL_BETA) {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnablePanels) ||
- extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd") ||
- extension_id == std::string("ljclpkphhpbpinifbeabbhlfddcpfdde") ||
- extension_id == std::string("ppleadejekpmccmnpjdimmlfljlkdfej") ||
- extension_id == std::string("eggnbpckecmjlblplehfpjjdhhidfdoj");
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnablePanels) ||
+ extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd") ||
+ extension_id == std::string("ljclpkphhpbpinifbeabbhlfddcpfdde") ||
+ extension_id == std::string("ppleadejekpmccmnpjdimmlfljlkdfej") ||
+ extension_id == std::string("eggnbpckecmjlblplehfpjjdhhidfdoj");
}
return true;
« no previous file with comments | « chrome/browser/ui/panels/panel_extension_browsertest.cc ('k') | chrome/browser/ui/passwords/password_manager_presenter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698