Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 namespace {
 
 // Returns info about extensions for files we support as wallpaper images.
 ui::SelectFileDialog::FileTypeInfo GetUserImageFileTypeInfo() {
   ui::SelectFileDialog::FileTypeInfo file_type_info;
   file_type_info.extensions.resize(1);
 
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpg"));
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpeg"));
@@ skipping 212 matching lines @@
   web_ui()->CallJavascriptFunction("SetWallpaperOptions.setSelectedImage",
                                    image_url, is_daily);
 }
 
 gfx::NativeWindow SetWallpaperOptionsHandler::GetBrowserWindow() const {
   Browser* browser =
       browser::FindBrowserWithWebContents(web_ui()->GetWebContents());
   return browser->window()->GetNativeWindow();
 }
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos