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

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 5 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) 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 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER2_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER2_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "chrome/browser/chromeos/cros/network_library.h" 11 #include "chrome/browser/chromeos/cros/network_library.h"
12 #include "chrome/browser/chromeos/cros/network_ui_data.h" 12 #include "chrome/browser/chromeos/cros/network_ui_data.h"
13 #include "chrome/browser/ui/webui/options2/options_ui2.h" 13 #include "chrome/browser/ui/webui/options2/options_ui.h"
14 #include "content/public/browser/notification_registrar.h" 14 #include "content/public/browser/notification_registrar.h"
15 #include "ui/gfx/native_widget_types.h" 15 #include "ui/gfx/native_widget_types.h"
16 16
17 class Browser; 17 class Browser;
18 18
19 namespace gfx { 19 namespace gfx {
20 class ImageSkia; 20 class ImageSkia;
21 } 21 }
22 22
23 namespace views { 23 namespace views {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 // Weak pointer factory so we can start connections at a later time 177 // Weak pointer factory so we can start connections at a later time
178 // without worrying that they will actually try to happen after the lifetime 178 // without worrying that they will actually try to happen after the lifetime
179 // of this object. 179 // of this object.
180 base::WeakPtrFactory<InternetOptionsHandler> weak_factory_; 180 base::WeakPtrFactory<InternetOptionsHandler> weak_factory_;
181 181
182 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler); 182 DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
183 }; 183 };
184 184
185 } // namespace options2 185 } // namespace options2
186 186
187 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER2_H _ 187 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698