Revert 262516 "Remove title and icon from chrome apps native style title bars."

chrome/browser/ui/views/apps/chrome_native_app_window_views_win.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/apps/chrome_native_app_window_views_win.h"
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
-#include "apps/ui/views/app_window_frame_view.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/apps/per_app_settings_service.h"
 #include "chrome/browser/apps/per_app_settings_service_factory.h"
 #include "chrome/browser/jumplist_updater_win.h"
 #include "chrome/browser/metro_utils/metro_chrome_win.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
-#include "chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h"
-#include "chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/browser/web_applications/web_app_win.h"
 #include "chrome/common/chrome_icon_resources_win.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/extension.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/remote_window_tree_host_win.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/win/hwnd_util.h"
-#include "ui/wm/core/easy_resize_window_targeter.h"
-
-#if defined(USE_ASH)
-#include "chrome/browser/ui/ash/ash_util.h"
-#endif
 
 namespace {
 
 void CreateIconAndSetRelaunchDetails(
     const base::FilePath& web_app_path,
     const base::FilePath& icon_file,
     const ShellIntegration::ShortcutInfo& shortcut_info,
     const HWND hwnd) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
@@ skipping 18 matching lines @@
     return;
   }
 
   ui::win::SetAppIconForWindow(icon_file.value(), hwnd);
   web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info.favicon);
 }
 
 }  // namespace
 
 ChromeNativeAppWindowViewsWin::ChromeNativeAppWindowViewsWin()
-    : weak_ptr_factory_(this), glass_frame_view_(NULL) {}
+    : weak_ptr_factory_(this) {}
 
 void ChromeNativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() {
   if (!ash::Shell::HasInstance())
     return;
 
   views::Widget* widget =
       implicit_cast<views::WidgetDelegate*>(this)->GetWidget();
   chrome::HostDesktopType host_desktop_type =
       chrome::GetHostDesktopTypeForNativeWindow(widget->GetNativeWindow());
   // Only switching into Ash from Native is supported. Tearing the user out of
@@ skipping 51 matching lines @@
       desktop_type = settings->GetDesktopLastLaunchedFrom(extension->id());
     } else {
       // We don't know what desktop this app was last launched from, so take our
       // best guess as to what desktop the user is on.
       desktop_type = chrome::GetActiveDesktop();
     }
   }
   if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
     init_params->context = ash::Shell::GetPrimaryRootWindow();
   else
-    init_params->native_widget = new AppWindowDesktopNativeWidgetAuraWin(this);
+    init_params->native_widget = new views::DesktopNativeWidgetAura(widget);
 }
 
 void ChromeNativeAppWindowViewsWin::InitializeDefaultWindow(
     const apps::AppWindow::CreateParams& create_params) {
   ChromeNativeAppWindowViews::InitializeDefaultWindow(create_params);
 
   const extensions::Extension* extension = app_window()->extension();
   std::string app_name =
       web_app::GenerateApplicationNameFromExtensionId(extension->id());
   base::string16 app_name_wide = base::UTF8ToWide(app_name);
   HWND hwnd = GetNativeAppWindowHWND();
   Profile* profile =
       Profile::FromBrowserContext(app_window()->browser_context());
   app_model_id_ =
       ShellIntegration::GetAppModelIdForProfile(app_name_wide,
                                                 profile->GetPath());
   ui::win::SetAppIdForWindow(app_model_id_, hwnd);
 
   web_app::UpdateShortcutInfoAndIconForApp(
       extension,
       profile,
       base::Bind(&ChromeNativeAppWindowViewsWin::OnShortcutInfoLoaded,
                  weak_ptr_factory_.GetWeakPtr()));
 
   UpdateShelfMenu();
 }
 
-views::NonClientFrameView*
-ChromeNativeAppWindowViewsWin::CreateStandardDesktopAppFrame() {
-  glass_frame_view_ = NULL;
-  if (ui::win::IsAeroGlassEnabled()) {
-    glass_frame_view_ = new GlassAppWindowFrameViewWin(this, widget());
-    return glass_frame_view_;
-  }
-  return ChromeNativeAppWindowViews::CreateStandardDesktopAppFrame();
-}
-
-apps::AppWindowFrameView*
-ChromeNativeAppWindowViewsWin::CreateNonStandardAppFrame() {
-  apps::AppWindowFrameView* frame =
-      ChromeNativeAppWindowViews::CreateNonStandardAppFrame();
-
-  if (!chrome::IsNativeWindowInAsh(widget()->GetNativeWindow())) {
-    aura::Window* root_window = widget()->GetNativeWindow()->GetRootWindow();
-    int resize_inside = frame->resize_inside_bounds_size();
-    gfx::Insets inset(
-        resize_inside, resize_inside, resize_inside, resize_inside);
-    root_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
-        new wm::EasyResizeWindowTargeter(root_window, inset, inset)));
-  }
-
-  return frame;
-}
-
 void ChromeNativeAppWindowViewsWin::Show() {
   ActivateParentDesktopIfNecessary();
   ChromeNativeAppWindowViews::Show();
 }
 
 void ChromeNativeAppWindowViewsWin::Activate() {
   ActivateParentDesktopIfNecessary();
   ChromeNativeAppWindowViews::Activate();
 }
 
@@ skipping 30 matching lines @@
     link->GetCommandLine()->AppendSwitchASCII(switches::kInstallFromWebstore,
                                               extension->id());
 
     ShellLinkItemList items;
     items.push_back(link);
     jumplist_updater.AddTasks(items);
   }
 
   jumplist_updater.CommitUpdate();
 }