Remove app/win/win_util.h,cc etc.

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index f3c69ae09a369c8c2dc9df50d77c80ee56979aa2..2771a4e9a2b7ffdeaba9414a8306e4ccc16856f8 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -59,6 +59,7 @@
 #include "chrome/browser/ui/views/update_recommended_message_box.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/browser/ui/window_sizer.h"
+#include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/native_window_notification_source.h"
@@ -83,10 +84,10 @@
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
-#include "app/win/win_util.h"
 #include "chrome/browser/aeropeek_manager.h"
 #include "chrome/browser/jumplist_win.h"
 #include "ui/base/view_prop.h"
+#include "ui/base/message_box_win.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/ui/views/accelerator_table_gtk.h"
 #include "views/window/hit_test.h"
@@ -1142,8 +1143,8 @@ void BrowserView::ShowProfileErrorDialog(int message_id) {
 #if defined(OS_WIN)
   string16 title = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
   string16 message = l10n_util::GetStringUTF16(message_id);
-  app::win::MessageBox(GetNativeHandle(), message, title,
-                       MB_OK | MB_ICONWARNING | MB_TOPMOST);
+  ui::MessageBox(GetNativeHandle(), message, title,
+                 MB_OK | MB_ICONWARNING | MB_TOPMOST);

[Ben Goodger (Google), 2011/01/27 18:44:22]

Can this whole function be rewritten to use platform_util?

[msw, 2011/02/01 23:12:56]

It's not a perfect match. I'll tweak this & other MessageBox code in a
subsequent change (maybe in a new issue...)

 #elif defined(OS_LINUX)
   std::string title = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME);
   std::string message = l10n_util::GetStringUTF8(message_id);
@@ -1400,12 +1401,8 @@ gfx::Rect BrowserView::GetInstantBounds() {
 gfx::Rect BrowserView::GrabWindowSnapshot(std::vector<unsigned char>*
                                           png_representation) {
   views::Window* window = GetWindow();
-
-#if defined(USE_X11)
-  ui::GrabWindowSnapshot(window->GetNativeWindow(), png_representation);
-#elif defined(OS_WIN)
-  app::win::GrabWindowSnapshot(window->GetNativeWindow(), png_representation);
-#endif
+  gfx::NativeWindow native_window= window->GetNativeWindow();

[Ben Goodger (Google), 2011/01/27 18:44:22]

space before =

[msw, 2011/02/01 23:12:56]

Not applicable in updated CL.
How did static analysis and I miss this? Good catch.

+  browser::GrabWindowSnapshot(native_window, png_representation);

[Ben Goodger (Google), 2011/01/27 18:44:22]

Does anyone actually call this method? I don't think they need to anymore... it
could be removed from BrowserWindow and all the platform impls.

[msw, 2011/02/01 23:12:56]

Good point; the updated CL consolidates a lot of GrabWindowSnapshot code.

 
   return window->GetBounds();
 }