| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/options/network_config_view.h" | 5 #include "chrome/browser/chromeos/options/network_config_view.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 | 8 | 
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" | 
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 32 #include "ui/base/l10n/l10n_util.h" | 32 #include "ui/base/l10n/l10n_util.h" | 
| 33 #include "ui/base/material_design/material_design_controller.h" | 33 #include "ui/base/material_design/material_design_controller.h" | 
| 34 #include "ui/gfx/color_palette.h" | 34 #include "ui/gfx/color_palette.h" | 
| 35 #include "ui/gfx/geometry/rect.h" | 35 #include "ui/gfx/geometry/rect.h" | 
| 36 #include "ui/gfx/image/image.h" | 36 #include "ui/gfx/image/image.h" | 
| 37 #include "ui/gfx/paint_vector_icon.h" | 37 #include "ui/gfx/paint_vector_icon.h" | 
| 38 #include "ui/vector_icons/vector_icons.h" | 38 #include "ui/vector_icons/vector_icons.h" | 
| 39 #include "ui/views/controls/button/md_text_button.h" | 39 #include "ui/views/controls/button/md_text_button.h" | 
| 40 #include "ui/views/controls/image_view.h" | 40 #include "ui/views/controls/image_view.h" | 
| 41 #include "ui/views/layout/fill_layout.h" | 41 #include "ui/views/layout/fill_layout.h" | 
| 42 #include "ui/views/layout/layout_constants.h" |  | 
| 43 #include "ui/views/widget/widget.h" | 42 #include "ui/views/widget/widget.h" | 
| 44 | 43 | 
| 45 using views::Widget; | 44 using views::Widget; | 
| 46 | 45 | 
| 47 namespace chromeos { | 46 namespace chromeos { | 
| 48 | 47 | 
| 49 namespace { | 48 namespace { | 
| 50 | 49 | 
| 51 // Used to check if a network config dialog is already showing. | 50 // Used to check if a network config dialog is already showing. | 
| 52 NetworkConfigView* g_instance = nullptr; | 51 NetworkConfigView* g_instance = nullptr; | 
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 338 } | 337 } | 
| 339 | 338 | 
| 340 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {} | 339 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {} | 
| 341 | 340 | 
| 342 gfx::Size ControlledSettingIndicatorView::CalculatePreferredSize() const { | 341 gfx::Size ControlledSettingIndicatorView::CalculatePreferredSize() const { | 
| 343   return (managed_ && visible()) ? image_view_->GetPreferredSize() | 342   return (managed_ && visible()) ? image_view_->GetPreferredSize() | 
| 344                                  : gfx::Size(); | 343                                  : gfx::Size(); | 
| 345 } | 344 } | 
| 346 | 345 | 
| 347 }  // namespace chromeos | 346 }  // namespace chromeos | 
| OLD | NEW | 
|---|