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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/set_wallpaper_options_handler.h

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wut Created 8 years, 4 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_SET_WALLPAPER_OPTIONS_HANDLER_ H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_SET_WALLPAPER_OPTIONS_HANDLER_H _
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SET_WALLPAPER_OPTIONS_HANDLER_ H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_SET_WALLPAPER_OPTIONS_HANDLER_H _
7 7
8 #include "ash/desktop_background/desktop_background_resources.h" 8 #include "ash/desktop_background/desktop_background_resources.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "chrome/browser/ui/webui/options2/options_ui.h" 10 #include "chrome/browser/ui/webui/options/options_ui.h"
11 #include "ui/base/dialogs/select_file_dialog.h" 11 #include "ui/base/dialogs/select_file_dialog.h"
12 #include "ui/gfx/native_widget_types.h" 12 #include "ui/gfx/native_widget_types.h"
13 13
14 namespace base { 14 namespace base {
15 class DictionaryValue; 15 class DictionaryValue;
16 class ListValue; 16 class ListValue;
17 } 17 }
18 18
19 namespace chromeos { 19 namespace chromeos {
20 20
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 scoped_refptr<ui::SelectFileDialog> select_file_dialog_; 86 scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
87 87
88 base::WeakPtrFactory<SetWallpaperOptionsHandler> weak_factory_; 88 base::WeakPtrFactory<SetWallpaperOptionsHandler> weak_factory_;
89 89
90 DISALLOW_COPY_AND_ASSIGN(SetWallpaperOptionsHandler); 90 DISALLOW_COPY_AND_ASSIGN(SetWallpaperOptionsHandler);
91 }; 91 };
92 92
93 } // namespace options 93 } // namespace options
94 } // namespace chromeos 94 } // namespace chromeos
95 95
96 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SET_WALLPAPER_OPTIONS_HANDL ER_H_ 96 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_SET_WALLPAPER_OPTIONS_HANDLE R_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698