Rename apps::ShellWindow to apps::AppWindow

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

 // Copyright 2013 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/cocoa/apps/native_app_window_cocoa.h"
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 20 matching lines @@
 //
 // Zooming is implemented manually in order to implement maximize functionality
 // and to support non resizable windows. The window will be resized explicitly
 // in the |WindowWillZoom| call.
 //
 // Attempting maximize and restore functionality with non resizable windows
 // using the native zoom method did not work, even with
 // windowWillUseStandardFrame, as the window would not restore back to the
 // desired size.
 
-
-using apps::ShellWindow;
+using apps::AppWindow;
 
 @interface NSWindow (NSPrivateApis)
 - (void)setBottomCornerRounded:(BOOL)rounded;
 @end
 
 // Replicate specific 10.7 SDK declarations for building with prior SDKs.
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 
 @interface NSWindow (LionSDKDeclarations)
@@ skipping 116 matching lines @@
 }
 
 @end
 
 // This is really a method on NSGrayFrame, so it should only be called on the
 // view passed into -[NSWindow drawCustomFrameRect:forView:].
 @interface NSView (PrivateMethods)
 - (CGFloat)roundedCornerRadius;
 @end
 
 @interface ShellNSWindow : ChromeEventProcessingWindow

[scheib, 2014/02/15 00:12:35]

Perhaps file an issue to clean up the mac NSWindow classes?

 @end
 @implementation ShellNSWindow
 @end
 
 @interface ShellCustomFrameNSWindow : ShellNSWindow
 
 - (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view;
 
 @end
 
@@ skipping 78 matching lines @@
   appWindow_->HandleMouseEvent(event);
 }
 
 @end
 
 @interface NSView (WebContentsView)
 - (void)setMouseDownCanMoveWindow:(BOOL)can_move;
 @end
 
 NativeAppWindowCocoa::NativeAppWindowCocoa(
-    ShellWindow* shell_window,
-    const ShellWindow::CreateParams& params)
-    : shell_window_(shell_window),
-      has_frame_(params.frame == ShellWindow::FRAME_CHROME),
+    AppWindow* app_window,
+    const AppWindow::CreateParams& params)
+    : app_window_(app_window),
+      has_frame_(params.frame == AppWindow::FRAME_CHROME),
       is_hidden_(false),
       is_hidden_with_app_(false),
       is_maximized_(false),
       is_fullscreen_(false),
       attention_request_id_(0),
       use_system_drag_(true) {
   Observe(web_contents());
 
   // Flip coordinates based on the primary screen.
   NSRect main_screen_rect = [[[NSScreen screens] objectAtIndex:0] frame];
@@ skipping 19 matching lines @@
   if (has_frame_) {
     bool should_use_native_frame =
         CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kAppsUseNativeFrame);
     window_class = should_use_native_frame ?
         [ShellNSWindow class] : [ShellCustomFrameNSWindow class];
   } else {
     window_class = [ShellFramelessNSWindow class];
   }
 
-  ShellWindow::SizeConstraints size_constraints =
-      shell_window_->size_constraints();
+  AppWindow::SizeConstraints size_constraints = app_window_->size_constraints();
   shows_resize_controls_ =
       params.resizable && !size_constraints.HasFixedSize();
   shows_fullscreen_controls_ =
       params.resizable && !size_constraints.HasMaximumSize();
   window.reset([[window_class alloc]
       initWithContentRect:cocoa_bounds
                 styleMask:GetWindowStyleMask()
                   backing:NSBackingStoreBuffered
                     defer:NO]);
   [window setTitle:base::SysUTF8ToNSString(extension()->name())];
@@ skipping 25 matching lines @@
     system_drag_exclude_areas_.push_back(window_bounds);
   }
 
   InstallView();
 
   [[window_controller_ window] setDelegate:window_controller_];
   [window_controller_ setAppWindow:this];
   UpdateWindowMinMaxSize();
 
   extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryCocoa(
-      Profile::FromBrowserContext(shell_window_->browser_context()),
+      Profile::FromBrowserContext(app_window_->browser_context()),
       window,
       extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
-      shell_window));
+      app_window));
 }
 
 NSUInteger NativeAppWindowCocoa::GetWindowStyleMask() const {
   NSUInteger style_mask = NSTitledWindowMask | NSClosableWindowMask |
                           NSMiniaturizableWindowMask;
   if (shows_resize_controls_)
     style_mask |= NSResizableWindowMask;
   if (!has_frame_ ||
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAppsUseNativeFrame)) {
@@ skipping 50 matching lines @@
 
 bool NativeAppWindowCocoa::IsMinimized() const {
   return [window() isMiniaturized];
 }
 
 bool NativeAppWindowCocoa::IsFullscreen() const {
   return is_fullscreen_;
 }
 
 void NativeAppWindowCocoa::SetFullscreen(int fullscreen_types) {
-  bool fullscreen = (fullscreen_types != ShellWindow::FULLSCREEN_TYPE_NONE);
+  bool fullscreen = (fullscreen_types != AppWindow::FULLSCREEN_TYPE_NONE);
   if (fullscreen == is_fullscreen_)
     return;
   is_fullscreen_ = fullscreen;
 
   if (base::mac::IsOSLionOrLater()) {
     // If going fullscreen, but the window is constrained (fullscreen UI control
     // is disabled), temporarily enable it. It will be disabled again on leaving
     // fullscreen.
     if (fullscreen && !shows_fullscreen_controls_)
       SetFullScreenCollectionBehavior(window(), true);
@@ skipping 80 matching lines @@
   return bounds;
 }
 
 void NativeAppWindowCocoa::Show() {
   is_hidden_ = false;
 
   if (is_hidden_with_app_) {
     // If there is a shim to gently request attention, return here. Otherwise
     // show the window as usual.
     if (apps::ExtensionAppShimHandler::RequestUserAttentionForWindow(
-            shell_window_)) {
+            app_window_)) {
       return;
     }
   }
 
   [window_controller_ showWindow:nil];
   Activate();
 }
 
 void NativeAppWindowCocoa::ShowInactive() {
   is_hidden_ = false;
@@ skipping 66 matching lines @@
   // setFrame: without animate: does not trigger a windowDidEndLiveResize: so
   // call it here.
   WindowDidFinishResize();
 }
 
 void NativeAppWindowCocoa::UpdateWindowIcon() {
   // TODO(junmin): implement.
 }
 
 void NativeAppWindowCocoa::UpdateWindowTitle() {
-  base::string16 title = shell_window_->GetTitle();
+  base::string16 title = app_window_->GetTitle();
   [window() setTitle:base::SysUTF16ToNSString(title)];
 }
 
 void NativeAppWindowCocoa::UpdateBadgeIcon() {
   // TODO(benwells): implement.
   NOTIMPLEMENTED();
 }
 
 void NativeAppWindowCocoa::UpdateShape(scoped_ptr<SkRegion> region) {
   NOTIMPLEMENTED();
@@ skipping 118 matching lines @@
   // We still need one ControlRegionView to cover the whole window such that
   // mouse events could be captured.
   NSView* web_view = web_contents()->GetView()->GetNativeView();
   gfx::Rect window_bounds(
       0, 0, NSWidth([web_view bounds]), NSHeight([web_view bounds]));
   system_drag_exclude_areas_.clear();
   system_drag_exclude_areas_.push_back(window_bounds);
 
   // Aggregate the draggable areas and non-draggable areas such that hit test
   // could be performed easily.
-  draggable_region_.reset(ShellWindow::RawDraggableRegionsToSkRegion(regions));
+  draggable_region_.reset(AppWindow::RawDraggableRegionsToSkRegion(regions));
 }
 
 void NativeAppWindowCocoa::HandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   if (event.skip_in_browser ||
       event.type == content::NativeWebKeyboardEvent::Char) {
     return;
   }
   [window() redispatchKeyEvent:event.os_event];
 }
@@ skipping 94 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void NativeAppWindowCocoa::RemoveObserver(
     web_modal::ModalDialogHostObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 void NativeAppWindowCocoa::WindowWillClose() {
   [window_controller_ setAppWindow:NULL];
-  shell_window_->OnNativeWindowChanged();
-  shell_window_->OnNativeClose();
+  app_window_->OnNativeWindowChanged();
+  app_window_->OnNativeClose();
 }
 
 void NativeAppWindowCocoa::WindowDidBecomeKey() {
   content::RenderWidgetHostView* rwhv =
       web_contents()->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetActive(true);
-  shell_window_->OnNativeWindowActivated();
+  app_window_->OnNativeWindowActivated();
 
   web_contents()->GetView()->RestoreFocus();
 }
 
 void NativeAppWindowCocoa::WindowDidResignKey() {
   // If our app is still active and we're still the key window, ignore this
   // message, since it just means that a menu extra (on the "system status bar")
   // was activated; we'll get another |-windowDidResignKey| if we ever really
   // lose key window status.
   if ([NSApp isActive] && ([NSApp keyWindow] == window()))
@@ skipping 23 matching lines @@
   is_fullscreen_ = ([window() styleMask] & NSFullScreenWindowMask) != 0;
   // If not fullscreen but the window is constrained, disable the fullscreen UI
   // control.
   if (!is_fullscreen_ && !shows_fullscreen_controls_)
     SetFullScreenCollectionBehavior(window(), false);
 
   UpdateRestoredBounds();
 }
 
 void NativeAppWindowCocoa::WindowDidResize() {
-  shell_window_->OnNativeWindowChanged();
+  app_window_->OnNativeWindowChanged();
 }
 
 void NativeAppWindowCocoa::WindowDidMove() {
   UpdateRestoredBounds();
-  shell_window_->OnNativeWindowChanged();
+  app_window_->OnNativeWindowChanged();
 }
 
 void NativeAppWindowCocoa::WindowDidMiniaturize() {
-  shell_window_->OnNativeWindowChanged();
+  app_window_->OnNativeWindowChanged();
 }
 
 void NativeAppWindowCocoa::WindowDidDeminiaturize() {
-  shell_window_->OnNativeWindowChanged();
+  app_window_->OnNativeWindowChanged();
 }
 
 void NativeAppWindowCocoa::WindowWillZoom() {
   // See top of file NOTE: Maximize and Zoom.
   if (IsMaximized())
     Restore();
   else
     Maximize();
 }
 
@@ skipping 56 matching lines @@
   CHECK(!window || [window isKindOfClass:[ShellNSWindow class]]);
   return static_cast<ShellNSWindow*>(window);
 }
 
 void NativeAppWindowCocoa::UpdateRestoredBounds() {
   if (IsRestored(*this))
     restored_bounds_ = [window() frame];
 }
 
 void NativeAppWindowCocoa::UpdateWindowMinMaxSize() {
-  gfx::Size min_size = shell_window_->size_constraints().GetMinimumSize();
+  gfx::Size min_size = app_window_->size_constraints().GetMinimumSize();
   [window() setContentMinSize:NSMakeSize(min_size.width(), min_size.height())];
 
-  gfx::Size max_size = shell_window_->size_constraints().GetMaximumSize();
-  const int kUnboundedSize = ShellWindow::SizeConstraints::kUnboundedSize;
+  gfx::Size max_size = app_window_->size_constraints().GetMaximumSize();
+  const int kUnboundedSize = AppWindow::SizeConstraints::kUnboundedSize;
   CGFloat max_width = max_size.width() == kUnboundedSize ?
       CGFLOAT_MAX : max_size.width();
   CGFloat max_height = max_size.height() == kUnboundedSize ?
       CGFLOAT_MAX : max_size.height();
   [window() setContentMaxSize:NSMakeSize(max_width, max_height)];
 }