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

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

Issue 8638016: Add OVERRIDE to chrome/browser/chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h"
11 #include "base/string16.h" 12 #include "base/string16.h"
12 #include "chrome/browser/chromeos/cros/network_library.h" 13 #include "chrome/browser/chromeos/cros/network_library.h"
13 #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow 14 #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow
14 #include "ui/views/window/dialog_delegate.h" 15 #include "ui/views/window/dialog_delegate.h"
15 #include "views/controls/button/button.h" // views::ButtonListener 16 #include "views/controls/button/button.h" // views::ButtonListener
16 17
17 namespace views { 18 namespace views {
18 class NativeTextButton; 19 class NativeTextButton;
19 class View; 20 class View;
20 } 21 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // views::ButtonListener overrides. 67 // views::ButtonListener overrides.
67 virtual void ButtonPressed( 68 virtual void ButtonPressed(
68 views::Button* sender, const views::Event& event) OVERRIDE; 69 views::Button* sender, const views::Event& event) OVERRIDE;
69 70
70 void set_delegate(Delegate* delegate) { 71 void set_delegate(Delegate* delegate) {
71 delegate_ = delegate; 72 delegate_ = delegate;
72 } 73 }
73 74
74 protected: 75 protected:
75 // views::View overrides: 76 // views::View overrides:
76 virtual void Layout(); 77 virtual void Layout() OVERRIDE;
77 virtual gfx::Size GetPreferredSize(); 78 virtual gfx::Size GetPreferredSize() OVERRIDE;
78 virtual void ViewHierarchyChanged(bool is_add, 79 virtual void ViewHierarchyChanged(bool is_add,
79 views::View* parent, 80 views::View* parent,
80 views::View* child); 81 views::View* child) OVERRIDE;
81 82
82 private: 83 private:
83 // Creates an "Advanced" button in the lower-left corner of the dialog. 84 // Creates an "Advanced" button in the lower-left corner of the dialog.
84 void CreateAdvancedButton(); 85 void CreateAdvancedButton();
85 86
86 // Resets the underlying view to show advanced options. 87 // Resets the underlying view to show advanced options.
87 void ShowAdvancedView(); 88 void ShowAdvancedView();
88 89
89 // There's always only one child view, which will get deleted when 90 // There's always only one child view, which will get deleted when
90 // NetworkConfigView gets cleaned up. 91 // NetworkConfigView gets cleaned up.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 std::string service_path_; 135 std::string service_path_;
135 NetworkConfigView* parent_; 136 NetworkConfigView* parent_;
136 137
137 private: 138 private:
138 DISALLOW_COPY_AND_ASSIGN(ChildNetworkConfigView); 139 DISALLOW_COPY_AND_ASSIGN(ChildNetworkConfigView);
139 }; 140 };
140 141
141 } // namespace chromeos 142 } // namespace chromeos
142 143
143 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_ 144 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698