Move Windows-specific code into NativeAppWindowViewsWin

Move Windows-specific code into NativeAppWindowViewsWin

NativeAppWindowViews has Windows-specific code in #ifdefs. Move this
into derived class NativeAppWindowViewsWin.

BUG=None

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=251029

[tmdiep, 2014-02-12 22:47:08]

This is the first of the sub-patches from:
https://codereview.chromium.org/158643002.

benwells: You're an owner of these files, so just need a rubber stamp from you
:)

[tapted, 2014-02-12 23:00:01]

Nice - lgtm. Thanks for splitting it up!

https://codereview.chromium.org/161753002/diff/1/chrome/browser/ui/views/apps...
File chrome/browser/ui/views/apps/native_app_window_views_win.cc (right):

https://codereview.chromium.org/161753002/diff/1/chrome/browser/ui/views/apps...
chrome/browser/ui/views/apps/native_app_window_views_win.cc:140: const
apps::ShellWindow::CreateParams& create_params) {
nit: indented two spaced too much

[benwells, 2014-02-13 04:50:10]

lgtm

[tmdiep, 2014-02-13 04:50:58]

The CQ bit was checked by tmdiep@chromium.org

[commit-bot: I haz the power, 2014-02-13 04:51:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tmdiep@chromium.org/161753002/110001

[commit-bot: I haz the power, 2014-02-13 04:51:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-13 04:51:07]

Failed to apply patch for
chrome/browser/ui/views/apps/native_app_window_views.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/views/apps/native_app_window_views.cc
  Hunk #1 succeeded at 7 with fuzz 1.
  Hunk #2 succeeded at 35 (offset 3 lines).
  Hunk #3 succeeded at 129 (offset 36 lines).
  Hunk #4 FAILED at 264.
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/ui/views/apps/native_app_window_views.cc.rej

Patch:       chrome/browser/ui/views/apps/native_app_window_views.cc
Index: chrome/browser/ui/views/apps/native_app_window_views.cc
diff --git a/chrome/browser/ui/views/apps/native_app_window_views.cc
b/chrome/browser/ui/views/apps/native_app_window_views.cc
index
aacb7cd7b22960a5c31c99283ca088746f42a18a..2f0fb24c4ecfdb2a734b9d0f111a697ef5654b23
100644
--- a/chrome/browser/ui/views/apps/native_app_window_views.cc
+++ b/chrome/browser/ui/views/apps/native_app_window_views.cc
@@ -7,8 +7,6 @@
 #include "apps/shell_window.h"
 #include "apps/ui/views/shell_window_frame_view.h"
 #include "base/command_line.h"
-#include "base/file_util.h"
-#include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ -34,14 +32,6 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
-#if defined(OS_WIN)
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/web_applications/web_app_ui.h"
-#include "chrome/browser/web_applications/web_app_win.h"
-#include "ui/base/win/shell.h"
-#include "ui/views/win/hwnd_util.h"
-#endif
-
 #if defined(OS_LINUX)
 #include "chrome/browser/shell_integration_linux.h"
 #endif
@@ -103,39 +93,6 @@ const std::map<ui::Accelerator, int>& GetAcceleratorTable()
{
   return accelerators;
 }
 
-#if defined(OS_WIN)
-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());
-
-  // Set the relaunch data so "Pin this program to taskbar" has the app's
-  // information.
-  CommandLine command_line = ShellIntegration::CommandLineArgsForLauncher(
-      shortcut_info.url,
-      shortcut_info.extension_id,
-      shortcut_info.profile_path);
-
-  base::FilePath chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
-    NOTREACHED();
-    return;
-  }
-  command_line.SetProgram(chrome_exe);
-  ui::win::SetRelaunchDetailsForWindow(command_line.GetCommandLineString(),
-      shortcut_info.title, hwnd);
-
-  if (!base::PathExists(web_app_path) &&
-      !base::CreateDirectory(web_app_path))
-    return;
-
-  ui::win::SetAppIconForWindow(icon_file.value(), hwnd);
-  web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info.favicon);
-}
-#endif
-
 #if defined(USE_ASH)
 // This class handles a user's fullscreen request (Shift+F4/F4).
 class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,
@@ -307,47 +264,8 @@ void NativeAppWindowViews::InitializeDefaultWindow(
     focus_manager->RegisterAccelerator(
         iter->first, ui::AcceleratorManager::kNormalPriority, this);
   }
-
-#if defined(OS_WIN)
-  base::string16 app_name_wide = base::UTF8ToWide(app_name);
-  HWND hwnd = GetNativeAppWindowHWND();
-  ui::win::SetAppIdForWindow(ShellIntegration::GetAppModelIdForProfile(
-      app_name_wide, profile()->GetPath()), hwnd);
-
-  web_app::UpdateShortcutInfoAndIconForApp(
-      *extension(), profile(),
-      base::Bind(&NativeAppWindowViews::OnShortcutInfoLoaded,
-                 weak_ptr_factory_.GetWeakPtr()));
-#endif
-}
-
-#if defined(OS_WIN)
-void NativeAppWindowViews::OnShortcutInfoLoaded(
-    const ShellIntegration::ShortcutInfo& shortcut_info) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-
-  HWND hwnd = GetNativeAppWindowHWND();
-
-  // Set window's icon to the one we're about to create/update in the web app
-  // path. The icon cache will refresh on icon creation.
-  base::FilePath web_app_path = web_app::GetWebAppDataDirectory(
-      shortcut_info.profile_path, shortcut_info.extension_id,
-      shortcut_info.url);
-  base::FilePath icon_file = web_app_path
-      .Append(web_app::internals::GetSanitizedFileName(shortcut_info.title))
-      .ReplaceExtension(FILE_PATH_LITERAL(".ico"));
-
-  content::BrowserThread::PostBlockingPoolTask(
-      FROM_HERE,
-      base::Bind(&CreateIconAndSetRelaunchDetails,
-                 web_app_path, icon_file, shortcut_info, hwnd));
 }
 
-HWND NativeAppWindowViews::GetNativeAppWindowHWND() const {
-  return views::HWNDForWidget(window_->GetTopLevelWidget());
-}
-#endif
-
 void NativeAppWindowViews::InitializePanelWindow(
     const ShellWindow::CreateParams& create_params) {
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_PANEL);

[tmdiep, 2014-02-13 06:15:37]

The CQ bit was checked by tmdiep@chromium.org

[commit-bot: I haz the power, 2014-02-13 06:16:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tmdiep@chromium.org/161753002/330001

[commit-bot: I haz the power, 2014-02-13 15:43:08]

Change committed as 251029