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

Unified Diff: ash/common/system/chromeos/network/network_list_md.cc

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 Created 4 years, 1 month 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: ash/common/system/chromeos/network/network_list_md.cc
diff --git a/ash/common/system/chromeos/network/network_list_md.cc b/ash/common/system/chromeos/network/network_list_md.cc
index 92c68c9c8eac9c9afb0b12329f90ac38e6ea1208..32be975299ac9b43546560dbe25c4b4783d052a5 100644
--- a/ash/common/system/chromeos/network/network_list_md.cc
+++ b/ash/common/system/chromeos/network/network_list_md.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include "ash/common/ash_view_ids.h"
#include "ash/common/system/chromeos/network/network_icon.h"
#include "ash/common/system/chromeos/network/network_icon_animation.h"
#include "ash/common/system/chromeos/network/network_info.h"
@@ -120,12 +121,12 @@ class NetworkListViewMd::WifiHeaderRowView : public views::View {
private:
void Init() {
- set_id(kHeaderRowId);
+ set_id(VIEW_ID_STICKY_HEADER);
set_background(views::Background::CreateSolidBackground(kBackgroundColor));
// TODO(tdanderson): Need to unify this with the generic menu row class.
views::View* container = new views::View;
- container->SetBorder(views::Border::CreateEmptyBorder(
- 0, kWifiRowLeftInset, 0, kWifiRowRightInset));
+ container->SetBorder(
+ views::CreateEmptyBorder(0, kWifiRowLeftInset, 0, kWifiRowRightInset));
views::FillLayout* layout = new views::FillLayout;
SetLayoutManager(layout);
AddChildView(container);
@@ -157,7 +158,7 @@ class NetworkListViewMd::WifiHeaderRowView : public views::View {
theme->GetSystemColor(ui::NativeTheme::kColorId_FocusedBorderColor);
const int horizontal_padding = (kWiFiButtonSize - join_image_.width()) / 2;
const int vertical_padding = (kWiFiButtonSize - join_image_.height()) / 2;
- join_->SetBorder(views::Border::CreateEmptyBorder(
+ join_->SetBorder(views::CreateEmptyBorder(
gfx::Insets(vertical_padding, horizontal_padding)));
join_->SetFocusForPlatform();
join_->SetFocusPainter(views::Painter::CreateSolidFocusPainter(

Powered by Google App Engine
This is Rietveld 408576698