chrome/browser/cocoa/browser_window_controller.mm - Issue 3173043: Move theme files in chrome/browser/ into a themes/ subdir.

Unified Diff: chrome/browser/cocoa/browser_window_controller.mm

Issue 3173043: Move theme files in chrome/browser/ into a themes/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/cocoa/bookmark_bar_folder_controller.mm ('K') | « chrome/browser/cocoa/browser_frame_view.mm ('k') | chrome/browser/cocoa/browser_window_controller_private.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/cocoa/browser_window_controller.mm

diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm

index d9373a89fd637c7bd50bcae21f6a3091fa6ac655..0e18570d237fcf4b8d1ab488e254d989467df60d 100644

--- a/chrome/browser/cocoa/browser_window_controller.mm

+++ b/chrome/browser/cocoa/browser_window_controller.mm

@@ -14,15 +14,9 @@

#import "base/scoped_nsobject.h"

#include "base/sys_string_conversions.h"

#include "chrome/app/chrome_dll_resource.h" // IDC_*

+#include "chrome/browser/bookmarks/bookmark_editor.h"

#include "chrome/browser/browser.h"

#include "chrome/browser/browser_list.h"

-#include "chrome/browser/browser_theme_provider.h"

-#include "chrome/browser/dock_info.h"

-#include "chrome/browser/encoding_menu_controller.h"

-#include "chrome/browser/location_bar.h"

-#include "chrome/browser/profile.h"

-#include "chrome/browser/window_sizer.h"

-#include "chrome/browser/bookmarks/bookmark_editor.h"

#import "chrome/browser/cocoa/background_gradient_view.h"

#import "chrome/browser/cocoa/bookmark_bar_controller.h"

#import "chrome/browser/cocoa/bookmark_editor_controller.h"

@@ -31,8 +25,8 @@

#import "chrome/browser/cocoa/download_shelf_controller.h"

#import "chrome/browser/cocoa/event_utils.h"

#import "chrome/browser/cocoa/fast_resize_view.h"

-#import "chrome/browser/cocoa/find_bar_cocoa_controller.h"

#import "chrome/browser/cocoa/find_bar_bridge.h"

+#import "chrome/browser/cocoa/find_bar_cocoa_controller.h"

#import "chrome/browser/cocoa/focus_tracker.h"

#import "chrome/browser/cocoa/fullscreen_controller.h"

#import "chrome/browser/cocoa/fullscreen_window.h"

@@ -41,18 +35,24 @@

#import "chrome/browser/cocoa/sad_tab_controller.h"

#import "chrome/browser/cocoa/status_bubble_mac.h"

#import "chrome/browser/cocoa/tab_contents_controller.h"

-#import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"

#import "chrome/browser/cocoa/tab_strip_controller.h"

+#import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"

#import "chrome/browser/cocoa/tab_strip_view.h"

#import "chrome/browser/cocoa/tab_view.h"

#import "chrome/browser/cocoa/tabpose_window.h"

#import "chrome/browser/cocoa/toolbar_controller.h"

+#include "chrome/browser/dock_info.h"

+#include "chrome/browser/encoding_menu_controller.h"

+#include "chrome/browser/location_bar.h"

+#include "chrome/browser/profile.h"

#include "chrome/browser/renderer_host/render_widget_host_view.h"

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/browser/sync/sync_ui_util_mac.h"

#include "chrome/browser/tab_contents/tab_contents.h"

#include "chrome/browser/tab_contents/tab_contents_view_mac.h"

#include "chrome/browser/tabs/tab_strip_model.h"

+#include "chrome/browser/themes/browser_theme_provider.h"

+#include "chrome/browser/window_sizer.h"

#include "grit/generated_resources.h"

#include "grit/locale_settings.h"