Use output_all_resource_defines=false in most grd files.

ash/display/display_util.cc

 // Copyright 2014 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 "ash/display/display_util.h"
 
 #include <algorithm>
 
 #include "ash/common/display/display_info.h"
 #include "ash/common/system/system_notifier.h"
@@ skipping 30 matching lines @@
 // is clicked.
 class DisplayErrorNotificationDelegate
     : public message_center::NotificationDelegate {
  public:
   DisplayErrorNotificationDelegate() = default;
 
   // message_center::NotificationDelegate:
   bool HasClickedListener() override { return true; }
 
   void Click() override {
-    ash::Shell::GetInstance()->new_window_delegate()->OpenFeedbackPage();
+    Shell::GetInstance()->new_window_delegate()->OpenFeedbackPage();
   }
 
  private:
   // Private destructor since NotificationDelegate is ref-counted.
   ~DisplayErrorNotificationDelegate() override = default;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayErrorNotificationDelegate);
 };
 
 // List of value UI Scale values. Scales for 2x are equivalent to 640,
@@ skipping 57 matching lines @@
   auto iter = std::find_if(modes.begin(), modes.end(),
                            [ui_scale](const DisplayMode& mode) {
                              return mode.ui_scale == ui_scale;
                            });
   if (iter == modes.end())
     return false;
   *out = *iter;
   return true;
 }
 
-void FindNextMode(std::vector<DisplayMode>::const_iterator& iter,
-                  const std::vector<DisplayMode>& modes,
-                  bool up,
-                  DisplayMode* out) {
-  DCHECK(iter != modes.end());
-  if (up && (iter + 1) != modes.end())
-    *out = *(iter + 1);
-  else if (!up && iter != modes.begin())
-    *out = *(iter - 1);
-  else
-    *out = *iter;
+DisplayMode FindNextMode(const std::vector<DisplayMode>& modes,

[Daniel Erat, 2016/07/11 17:50:20]

i don't understand why these changes are here; they're not mentioned in the
description.

[Lei Zhang, 2016/07/11 17:53:10]

Just fixing lint errors. |iter| was being passed by non-const-ref. Updated CL
description.

+                         size_t index,
+                         bool up) {
+  DCHECK_LT(index, modes.size());
+  size_t new_index = index;
+  if (up && (index + 1 < modes.size()))
+    ++new_index;
+  else if (!up && index != 0)
+    --new_index;
+  return modes[new_index];
 }
 
 }  // namespace
 
 std::vector<DisplayMode> CreateInternalDisplayModeList(
     const DisplayMode& native_mode) {
   std::vector<DisplayMode> display_mode_list;
 
   float native_ui_scale = (native_mode.device_scale_factor == 1.25f)
                               ? 1.0f
@@ skipping 57 matching lines @@
                                   bool up,
                                   DisplayMode* out) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (!display_manager->IsActiveDisplayId(info.id()) ||
       !display::Display::IsInternalDisplayId(info.id())) {
     return false;
   }
   const std::vector<DisplayMode>& modes = info.display_modes();
   ScaleComparator comparator(info.configured_ui_scale());
   auto iter = std::find_if(modes.begin(), modes.end(), comparator);
-  FindNextMode(iter, modes, up, out);
+  *out = FindNextMode(modes, iter - modes.begin(), up);
   return true;
 }
 
 bool GetDisplayModeForNextResolution(const DisplayInfo& info,
                                      bool up,
                                      DisplayMode* out) {
   if (display::Display::IsInternalDisplayId(info.id()))
     return false;
   const std::vector<DisplayMode>& modes = info.display_modes();
   DisplayMode tmp(info.size_in_pixel(), 0.0f, false, false);
   tmp.device_scale_factor = info.device_scale_factor();
   gfx::Size resolution = tmp.GetSizeInDIP(false);
   auto iter = std::find_if(modes.begin(), modes.end(),
                            [resolution](const DisplayMode& mode) {
                              return mode.GetSizeInDIP(false) == resolution;
                            });
-  FindNextMode(iter, modes, up, out);
+  *out = FindNextMode(modes, iter - modes.begin(), up);
   return true;
 }
 
 bool SetDisplayUIScale(int64_t id, float ui_scale) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (!display_manager->IsActiveDisplayId(id) ||
       !display::Display::IsInternalDisplayId(id)) {
     return false;
   }
   const DisplayInfo& info = display_manager->GetDisplayInfo(id);
@@ skipping 187 matching lines @@
   DCHECK_NE(id1, id2);
   // Output index is stored in the first 8 bits. See GetDisplayIdFromEDID
   // in edid_parser.cc.
   int index_1 = id1 & 0xFF;
   int index_2 = id2 & 0xFF;
   DCHECK_NE(index_1, index_2) << id1 << " and " << id2;
   return display::Display::IsInternalDisplayId(id1) ||
          (index_1 < index_2 && !display::Display::IsInternalDisplayId(id2));
 }
 
+#if defined(OS_CHROMEOS)
 void ShowDisplayErrorNotification(int message_id) {
   // Always remove the notification to make sure the notification appears
   // as a popup in any situation.
   message_center::MessageCenter::Get()->RemoveNotification(
       kDisplayErrorNotificationId, false /* by_user */);
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   std::unique_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE, kDisplayErrorNotificationId,
           base::string16(),  // title
           l10n_util::GetStringUTF16(message_id),
           bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY),
           base::string16(),  // display_source
           GURL(), message_center::NotifierId(
                       message_center::NotifierId::SYSTEM_COMPONENT,
                       system_notifier::kNotifierDisplayError),
           message_center::RichNotificationData(),
           new DisplayErrorNotificationDelegate));
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
+#endif
 
 base::string16 GetDisplayErrorNotificationMessageForTest() {
   message_center::NotificationList::Notifications notifications =
       message_center::MessageCenter::Get()->GetVisibleNotifications();
   for (auto* const notification : notifications) {
     if (notification->id() == kDisplayErrorNotificationId)
       return notification->message();
   }
   return base::string16();
 }
 
 }  // namespace ash