Chromium Code Reviews| Index: chrome/browser/about_flags.cc |
| =================================================================== |
| --- chrome/browser/about_flags.cc (revision 270335) |
| +++ chrome/browser/about_flags.cc (working copy) |
| @@ -10,7 +10,6 @@ |
| #include <set> |
| #include <utility> |
| -#include "ash/ash_switches.h" |
| #include "base/command_line.h" |
| #include "base/memory/singleton.h" |
| #include "base/strings/string_number_conversions.h" |
| @@ -99,7 +98,7 @@ |
| CommandLine::StringType GetSwitchString(const std::string& flag) { |
| CommandLine cmd_line(CommandLine::NO_PROGRAM); |
| cmd_line.AppendSwitch(flag); |
| - DCHECK(cmd_line.argv().size() == 2); |
| + DCHECK_EQ(2U, cmd_line.argv().size()); |
| return cmd_line.argv()[1]; |
| } |
| @@ -1223,7 +1222,7 @@ |
| kOsDesktop, |
| MULTI_VALUE_TYPE(kLCDTextChoices) |
| }, |
| -#ifndef USE_AURA |
| +#if defined(OS_ANDROID) |
|
piman
2014/05/15 16:57:47
Actually, we want this on mac too.
Lei Zhang
2014/05/20 02:38:21
Are you going to do that in a different CL soon? A
piman
2014/05/20 02:50:58
Basic support just got added last week - https://c
|
| { |
| "delegated-renderer", |
| IDS_FLAGS_DELEGATED_RENDERER_NAME, |