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

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

Issue 6452011: Rework tree APIs to reflect Google style and more const-correctness.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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"
(...skipping 20 matching lines...) Expand all
31 31
32 NetworkConfigView::NetworkConfigView() 32 NetworkConfigView::NetworkConfigView()
33 : browser_mode_(true), 33 : browser_mode_(true),
34 title_(UTF16ToWide( 34 title_(UTF16ToWide(
35 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_NETWORKS))), 35 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_NETWORKS))),
36 wificonfig_view_(new WifiConfigView(this)), 36 wificonfig_view_(new WifiConfigView(this)),
37 delegate_(NULL) { 37 delegate_(NULL) {
38 } 38 }
39 39
40 gfx::NativeWindow NetworkConfigView::GetNativeWindow() const { 40 gfx::NativeWindow NetworkConfigView::GetNativeWindow() const {
41 return GTK_WINDOW(static_cast<WidgetGtk*>(GetWidget())->GetNativeView()); 41 return
42 GTK_WINDOW(static_cast<const WidgetGtk*>(GetWidget())->GetNativeView());
42 } 43 }
43 44
44 std::wstring NetworkConfigView::GetDialogButtonLabel( 45 std::wstring NetworkConfigView::GetDialogButtonLabel(
45 MessageBoxFlags::DialogButton button) const { 46 MessageBoxFlags::DialogButton button) const {
46 if (button == MessageBoxFlags::DIALOGBUTTON_OK) 47 if (button == MessageBoxFlags::DIALOGBUTTON_OK)
47 return UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_CONNECT)); 48 return UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_CONNECT));
48 return std::wstring(); 49 return std::wstring();
49 } 50 }
50 51
51 bool NetworkConfigView::IsDialogButtonEnabled( 52 bool NetworkConfigView::IsDialogButtonEnabled(
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 90
90 void NetworkConfigView::ViewHierarchyChanged( 91 void NetworkConfigView::ViewHierarchyChanged(
91 bool is_add, views::View* parent, views::View* child) { 92 bool is_add, views::View* parent, views::View* child) {
92 // Can't init before we're inserted into a Container, because we require 93 // Can't init before we're inserted into a Container, because we require
93 // a HWND to parent native child controls to. 94 // a HWND to parent native child controls to.
94 if (is_add && child == this) 95 if (is_add && child == this)
95 AddChildView(wificonfig_view_); 96 AddChildView(wificonfig_view_);
96 } 97 }
97 98
98 } // namespace chromeos 99 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698