Move app/mac/ files to ui/gfx/mac/ directory.

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
-#include "app/mac/scoped_nsdisable_screen_updates.h"
-#include "app/mac/nsimage_cache.h"
 #include "base/mac/mac_util.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util_mac.h"
@@ skipping 18 matching lines @@
 #import "chrome/browser/ui/cocoa/fullscreen_controller.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/ui/cocoa/sidebar_controller.h"
 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
+#import "chrome/browser/ui/cocoa/tabpose_window.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
-#import "chrome/browser/ui/cocoa/tabpose_window.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tabs/dock_info.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/gfx/mac/nsimage_cache.h"
+#include "ui/gfx/mac/scoped_ns_disable_screen_updates.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 
 // ORGANIZATION: This is a big file. It is (in principle) organized as follows
 // (in order):
 // 1. Interfaces. Very short, one-time-use classes may include an implementation
 //    immediately after their interface.
 // 2. The general implementation section, ordered as follows:
 //      i. Public methods and overrides.
 //     ii. Overrides/implementations of undocumented methods.
@@ skipping 459 matching lines @@
 }
 
 // Called when the user wants to close a window or from the shutdown process.
 // The Browser object is in control of whether or not we're allowed to close. It
 // may defer closing due to several states, such as onUnload handlers needing to
 // be fired. If closing is deferred, the Browser will handle the processing
 // required to get us to the closing state and (by watching for all the tabs
 // going away) will again call to close the window when it's finally ready.
 - (BOOL)windowShouldClose:(id)sender {
   // Disable updates while closing all tabs to avoid flickering.
-  app::mac::ScopedNSDisableScreenUpdates disabler;
+  gfx::ScopedNSDisableScreenUpdates disabler;
   // Give beforeunload handlers the chance to cancel the close before we hide
   // the window below.
   if (!browser_->ShouldCloseWindow())
     return NO;
 
   // saveWindowPositionIfNeeded: only works if we are the last active
   // window, but orderOut: ends up activating another window, so we
   // have to save the window position before we call orderOut:.
   [self saveWindowPositionIfNeeded];
 
@@ skipping 681 matching lines @@
 - (void)focusTabContents {
   [[self window] makeFirstResponder:[tabStripController_ activeTabView]];
 }
 
 - (void)layoutTabs {
   [tabStripController_ layoutTabs];
 }
 
 - (TabWindowController*)detachTabToNewWindow:(TabView*)tabView {
   // Disable screen updates so that this appears as a single visual change.
-  app::mac::ScopedNSDisableScreenUpdates disabler;
+  gfx::ScopedNSDisableScreenUpdates disabler;
 
   // Fetch the tab contents for the tab being dragged.
   int index = [tabStripController_ modelIndexForTabView:tabView];
   TabContentsWrapper* contents = browser_->GetTabContentsWrapperAt(index);
 
   // Set the window size. Need to do this before we detach the tab so it's
   // still in the window. We have to flip the coordinates as that's what
   // is expected by the Browser code.
   NSWindow* sourceWindow = [tabView window];
   NSRect windowRect = [sourceWindow frame];
@@ skipping 379 matching lines @@
 // If the browser is in incognito mode, install the image view to decorate
 // the window at the upper right. Use the same base y coordinate as the
 // tab strip.
 - (void)installIncognitoBadge {
   // Only install if this browser window is OTR and has a tab strip.
   if (!browser_->profile()->IsOffTheRecord() || ![self hasTabStrip])
     return;
 
   // Install the image into the badge view and size the view appropriately.
   // Hide it for now; positioning and showing will be done by the layout code.
-  NSImage* image = app::mac::GetCachedImageWithName(@"otr_icon.pdf");
+  NSImage* image = gfx::GetCachedImageWithName(@"otr_icon.pdf");
   incognitoBadge_.reset([[IncognitoImageView alloc] init]);
   [incognitoBadge_ setImage:image];
   [incognitoBadge_ setFrameSize:[image size]];
   [incognitoBadge_ setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
   [incognitoBadge_ setHidden:YES];
 
   // Install the view.
   [[[[self window] contentView] superview] addSubview:incognitoBadge_];
 }
 
@@ skipping 543 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)