diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
7 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/ui/cocoa/about_window_controller.mm b/chrome/browser/ui/cocoa/about_window_controller.mm index 38d0364..a6d10d8 100644 --- a/chrome/browser/ui/cocoa/about_window_controller.mm +++ b/chrome/browser/ui/cocoa/about_window_controller.mm @@ -9,11 +9,11 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/browser_window.h" #import "chrome/browser/cocoa/keystone_glue.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/background_tile_view.h" #include "chrome/browser/ui/cocoa/restart_browser.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h index 3a77258..48333e7 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/task.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/browser_window.h" +#include "chrome/browser/ui/browser_window.h" #include "content/common/notification_registrar.h" class Browser; diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm index a1f5be5..5666f2c 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm @@ -5,9 +5,9 @@ #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/sync/sync_ui_util.h" +#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #include "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm index 1205c58..a6ccdcb 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/values.h" -#import "chrome/browser/browser_window.h" +#import "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h" diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm index f6cac49..f18edf5 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm @@ -1,14 +1,14 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// 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. #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/browser_window.h" +#include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" -#import "chrome/browser/ui/cocoa/find_pasteboard.h" #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h" +#import "chrome/browser/ui/cocoa/find_pasteboard.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm index 4375d4a..9f51763 100644 --- a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm +++ b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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/tabpose_window.h" -#import "chrome/browser/browser_window.h" #include "chrome/browser/tabs/tab_strip_model.h" +#import "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm index 6d9e3ac..a83f0d1 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm @@ -1,18 +1,18 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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 <Cocoa/Cocoa.h> -#import "chrome/browser/browser_window.h" +#import "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/new_tab_button.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "content/browser/tab_contents/tab_contents.h" #include "content/browser/site_instance.h" +#include "content/browser/tab_contents/tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" |