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

Side by Side Diff: chrome/browser/chromeos/options/network_config_view.cc

Issue 6382009: views: Move grid_layout files into layout directory. Final Part. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/chromeos/options/wifi_config_view.h" 11 #include "chrome/browser/chromeos/options/wifi_config_view.h"
12 #include "grit/chromium_strings.h" 12 #include "grit/chromium_strings.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "grit/locale_settings.h" 14 #include "grit/locale_settings.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 #include "views/grid_layout.h" 16 #include "views/layout/grid_layout.h"
17 #include "views/layout/layout_constants.h" 17 #include "views/layout/layout_constants.h"
18 #include "views/widget/widget_gtk.h" 18 #include "views/widget/widget_gtk.h"
19 #include "views/window/window.h" 19 #include "views/window/window.h"
20 20
21 using views::WidgetGtk; 21 using views::WidgetGtk;
22 22
23 namespace chromeos { 23 namespace chromeos {
24 24
25 NetworkConfigView::NetworkConfigView(const WifiNetwork* wifi) 25 NetworkConfigView::NetworkConfigView(const WifiNetwork* wifi)
26 : browser_mode_(true), 26 : browser_mode_(true),
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 void NetworkConfigView::ViewHierarchyChanged( 90 void NetworkConfigView::ViewHierarchyChanged(
91 bool is_add, views::View* parent, views::View* child) { 91 bool is_add, views::View* parent, views::View* child) {
92 // Can't init before we're inserted into a Container, because we require 92 // Can't init before we're inserted into a Container, because we require
93 // a HWND to parent native child controls to. 93 // a HWND to parent native child controls to.
94 if (is_add && child == this) 94 if (is_add && child == this)
95 AddChildView(wificonfig_view_); 95 AddChildView(wificonfig_view_);
96 } 96 }
97 97
98 } // namespace chromeos 98 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/user_image_view.cc ('k') | chrome/browser/chromeos/options/settings_page_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698