Restart Chrome if per session flags have been specified on ChromeOS.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 22 matching lines @@
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/message_center/message_center_switches.h"
 #include "ui/surface/surface_switches.h"
 
 #if defined(USE_ASH)
 #include "ash/ash_switches.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
+#include "third_party/cros_system_api/switches/chrome_switches.h"
 #endif
 
 using content::UserMetricsAction;
 
 namespace about_flags {
 
 // Macros to simplify specifying the type.
 #define SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, switch_value) \
     Experiment::SINGLE_VALUE, \
     command_line_switch, switch_value, NULL, NULL, NULL, 0
@@ skipping 25 matching lines @@
     {kOsLinux, "Linux"},
     {kOsCrOS, "Chrome OS"},
     {kOsAndroid, "Android"},
     {kOsCrOSOwnerOnly, "Chrome OS (owner only)"},
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kBitsToOs); ++i)
     if (bitmask & kBitsToOs[i].bit)
       list->Append(new StringValue(kBitsToOs[i].name));
 }
 
+// Convert switch constants to proper CommandLine::StringType strings.
+CommandLine::StringType GetSwitchString(const std::string& flag) {
+#if defined(OS_WIN)
+  CommandLine::StringType result(L"--");
+  result.append(ASCIIToWide(flag));
+#else
+  CommandLine::StringType result("--");
+  result.append(flag);
+#endif
+  return result;
+}
+
 const Experiment::Choice
     kOmniboxHistoryQuickProviderReorderForInliningChoices[] = {
   { IDS_FLAGS_OMNIBOX_HISTORY_QUICK_PROVIDER_REORDER_FOR_INLINING_AUTOMATIC,
     "",
     "" },
   { IDS_FLAGS_OMNIBOX_HISTORY_QUICK_PROVIDER_REORDER_FOR_INLINING_ENABLED,
     switches::kOmniboxHistoryQuickProviderReorderForInlining,
     switches::kOmniboxHistoryQuickProviderReorderForInliningEnabled },
   { IDS_FLAGS_OMNIBOX_HISTORY_QUICK_PROVIDER_REORDER_FOR_INLINING_DISABLED,
     switches::kOmniboxHistoryQuickProviderReorderForInlining,
@@ skipping 1646 matching lines @@
   } else {
     description_id = choices[index].description_id;
   }
   return l10n_util::GetStringUTF16(description_id);
 }
 
 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line) {
   FlagsState::GetInstance()->ConvertFlagsToSwitches(prefs, command_line);
 }
 
+bool CompareSwitchesToCurrentCommandLine(const CommandLine& new_cmdline,

[Mattias Nissler (ping if slow), 2013/06/12 14:53:03]

Not using this here? Maybe move to where the function gets used?

[pastarmovj, 2013/06/12 16:19:33]

Yet this function is used specifically for flags therefore I kept it in the
about_flags scope. Or do you mean something else by not used here?

[Mattias Nissler (ping if slow), 2013/06/13 16:55:57]

You are right, it depends on flags knowledge (i.e. delimiters), so let's keep it
here.

+                                         const CommandLine& active_cmdline) {
+  CommandLine::StringVector new_flags;
+  CommandLine::StringVector active_flags;
+  // Scoop the flags from the new command line.

[Mattias Nissler (ping if slow), 2013/06/12 14:53:03]

Seems like you could make a helper function for doing that for a given command
line object?

[pastarmovj, 2013/06/12 16:19:33]

Done.

+  CommandLine::StringVector::const_iterator first =
+      std::find(new_cmdline.argv().begin(), new_cmdline.argv().end(),
+                GetSwitchString(switches::kFlagSwitchesBegin));
+  CommandLine::StringVector::const_iterator last =
+      std::find(new_cmdline.argv().begin(), new_cmdline.argv().end(),
+                GetSwitchString(switches::kFlagSwitchesEnd));
+  if (first != new_cmdline.argv().end() && last != new_cmdline.argv().end())
+    new_flags.assign(first + 1, last);
+  // Scoop the flags set on the current command line.
+  // First do the ones between --flag-switches-begin and --flag-switches-end.
+  first = std::find(active_cmdline.argv().begin(), active_cmdline.argv().end(),
+                    GetSwitchString(switches::kFlagSwitchesBegin));
+  last = std::find(active_cmdline.argv().begin(), active_cmdline.argv().end(),
+                   GetSwitchString(switches::kFlagSwitchesEnd));
+  if (first != active_cmdline.argv().end() &&
+      last != active_cmdline.argv().end()) {
+    active_flags.assign(first + 1, last);
+  }
+#if defined(OS_CHROMEOS)
+  // Then add those between --policy-switches-begin and --policy-switches-end.

[Mattias Nissler (ping if slow), 2013/06/12 14:53:03]

Oh, and bonus points for the helper to handle this case as well :)

[pastarmovj, 2013/06/12 16:19:33]

Well I can do this for both CommandLine's therefore simply put it in that
function of ours too.

+  first = std::find(active_cmdline.argv().begin(), active_cmdline.argv().end(),
+                    GetSwitchString(chromeos::switches::kPolicySwitchesBegin));
+  last = std::find(active_cmdline.argv().begin(), active_cmdline.argv().end(),
+                   GetSwitchString(chromeos::switches::kPolicySwitchesEnd));
+  if (first != active_cmdline.argv().end() &&
+      last != active_cmdline.argv().end()) {
+    active_flags.insert(active_flags.end(), first + 1, last);
+  }
+#endif
+  // Don't even bother sorting and comparing if the sizes differ.

[Mattias Nissler (ping if slow), 2013/06/12 14:53:03]

If you were to insert into a std::set directly, the comparison would become
trivial

[pastarmovj, 2013/06/12 16:19:33]

Done.

+  if (new_flags.size() != active_flags.size())
+    return false;
+
+  // Sort and compare.
+  std::sort(new_flags.begin(), new_flags.end());
+  std::sort(active_flags.begin(), active_flags.end());
+  CommandLine::StringVector::const_iterator new_it = new_flags.begin();
+  CommandLine::StringVector::const_iterator active_it = active_flags.begin();
+  for (; new_it != new_flags.end(); ++new_it, ++active_it) {
+    if (*new_it != *active_it)
+      return false;
+  }
+  return true;
+}
+
 void GetFlagsExperimentsData(PrefService* prefs,
                              FlagAccess access,
                              base::ListValue* supported_experiments,
                              base::ListValue* unsupported_experiments) {
   std::set<std::string> enabled_experiments;
   GetSanitizedEnabledFlags(prefs, &enabled_experiments);
 
   int current_platform = GetCurrentPlatform();
 
   for (size_t i = 0; i < num_experiments; ++i) {
@@ skipping 273 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags