Rename the 'custom' frame option to 'none' for shell windows.

R=mihaip@google.com TBR=ben@chromium.org BUG=133095 Review URL: https://chromiumcodereview.appspot.com/10573021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143114 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Jun 20, 2012 · 2040fdf · 2040fdf
1 parent a02cf4c
commit 2040fdf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc
@@ -22,7 +22,7 @@ namespace Create = app_window::Create;
 
 namespace extensions {
 
-const char kCustomFrameOption[] = "custom";
+const char kNoneFrameOption[] = "none";
 
 bool AppWindowCreateFunction::RunImpl() {
   scoped_ptr<Create::Params> params(Create::Params::Create(*args_));
@@ -46,8 +46,8 @@ bool AppWindowCreateFunction::RunImpl() {
       create_params.bounds.set_y(*options->top.get());
 
     if (options->frame.get()) {
-      create_params.frame = *options->frame == kCustomFrameOption ?
-          ShellWindow::CreateParams::FRAME_CUSTOM :
+      create_params.frame = *options->frame == kNoneFrameOption ?
+          ShellWindow::CreateParams::FRAME_NONE :
           ShellWindow::CreateParams::FRAME_CHROME;
     }
 

diff --git a/chrome/browser/ui/extensions/shell_window.h b/chrome/browser/ui/extensions/shell_window.h
@@ -41,7 +41,7 @@ class ShellWindow : public content::NotificationObserver,
   struct CreateParams {
     enum Frame {
       FRAME_CHROME, // Chrome-style window frame.
-      FRAME_CUSTOM, // Chromeless frame.
+      FRAME_NONE, // Frameless window.
     };
 
     CreateParams();

diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc
@@ -287,7 +287,7 @@ ShellWindowViews::ShellWindowViews(Profile* profile,
       web_view_(NULL),
       is_fullscreen_(false),
       use_custom_frame_(
-          win_params.frame == ShellWindow::CreateParams::FRAME_CUSTOM) {
+          win_params.frame == ShellWindow::CreateParams::FRAME_NONE) {
   window_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.delegate = this;

diff --git a/chrome/common/extensions/api/app_window.idl b/chrome/common/extensions/api/app_window.idl
@@ -23,7 +23,7 @@
     // Window type: 'panel' or 'shell' (defaults to 'shell')
     DOMString? type;
 
-    // Frame type: 'custom' or 'chrome' (defaults to 'chrome')
+    // Frame type: 'none' or 'chrome' (defaults to 'chrome')
     DOMString? frame;
   };