Reverse logic of window / tab control in bookmark app creation.

chrome/browser/ui/views/extensions/bookmark_app_bubble_view.cc

 // Copyright 2014 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/views/extensions/bookmark_app_bubble_view.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/app_icon_loader_impl.h"
@@ skipping 71 matching lines @@
     views::View* anchor_view,
     Profile* profile,
     const WebApplicationInfo& web_app_info,
     const std::string& extension_id)
     : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       profile_(profile),
       web_app_info_(web_app_info),
       extension_id_(extension_id),
       add_button_(NULL),
       cancel_button_(NULL),
-      open_as_tab_checkbox_(NULL),
+      open_as_window_checkbox_(NULL),
       title_tf_(NULL),
       remove_app_(true),
       app_icon_loader_(new extensions::AppIconLoaderImpl(profile,
                                                          kIconSize,
                                                          this)) {
   const SkColor background_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground);
   set_arrow(views::BubbleBorder::TOP_CENTER);
   set_color(background_color);
   set_background(views::Background::CreateSolidBackground(background_color));
@@ skipping 78 matching lines @@
   layout->AddView(icon_image_view_);
   app_icon_loader_->FetchImage(extension_id_);
 
   title_tf_ = new views::Textfield();
   title_tf_->SetText(extension ? base::UTF8ToUTF16(extension->name())
                                : web_app_info_.title);
   layout->AddView(title_tf_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, CONTENT_COLUMN_SET_ID);
-  open_as_tab_checkbox_ = new views::Checkbox(
-      l10n_util::GetStringUTF16(IDS_BOOKMARK_APP_BUBBLE_OPEN_AS_TAB));
-  open_as_tab_checkbox_->SetChecked(
+  open_as_window_checkbox_ = new views::Checkbox(
+      l10n_util::GetStringUTF16(IDS_BOOKMARK_APP_BUBBLE_OPEN_AS_WINDOW));
+  open_as_window_checkbox_->SetChecked(
       profile_->GetPrefs()->GetInteger(
           extensions::pref_names::kBookmarkAppCreationLaunchType) ==
-              extensions::LAUNCH_TYPE_REGULAR);
-  layout->AddView(open_as_tab_checkbox_);
+              extensions::LAUNCH_TYPE_WINDOW);
+  layout->AddView(open_as_window_checkbox_);
   layout->AddView(add_button_);
   layout->AddView(cancel_button_);
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
 }
 
 views::View* BookmarkAppBubbleView::GetInitiallyFocusedView() {
   return title_tf_;
 }
@@ skipping 46 matching lines @@
   // Unset |remove_app_| so we don't delete the bookmark after the window
   // closes.
   if (sender == add_button_)
     remove_app_ = false;
 
   GetWidget()->Close();
 }
 
 void BookmarkAppBubbleView::ApplyEdits() {
   // Set the launch type based on the checkbox.
-  extensions::LaunchType launch_type = open_as_tab_checkbox_->checked()
-      ? extensions::LAUNCH_TYPE_REGULAR
-      : extensions::LAUNCH_TYPE_WINDOW;
+  extensions::LaunchType launch_type = open_as_window_checkbox_->checked()
+      ? extensions::LAUNCH_TYPE_WINDOW
+      : extensions::LAUNCH_TYPE_REGULAR;
   profile_->GetPrefs()->SetInteger(
           extensions::pref_names::kBookmarkAppCreationLaunchType, launch_type);
   extensions::SetLaunchType(GetExtensionService(profile_),
                             extension_id_,
                             launch_type);
 
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile_)->GetExtensionById(
           extension_id_, extensions::ExtensionRegistry::EVERYTHING);
 
@@ skipping 30 matching lines @@
                                 GURL(chrome::kChromeUIAppsURL),
                                 ui::PAGE_TRANSITION_LINK);
   params.disposition = SINGLETON_TAB;
   chrome::Navigate(&params);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_APP_INSTALLED_TO_NTP,
       content::Source<content::WebContents>(params.target_contents),
       content::Details<const std::string>(&extension_id_));
 }