Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.mm

Issue 6657003: Update a bunch of files to the new location of notification files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" 5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
(...skipping 18 matching lines...) Expand all
29 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 29 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
30 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" 30 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
31 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h" 31 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h"
32 #include "chrome/browser/ui/cocoa/restart_browser.h" 32 #include "chrome/browser/ui/cocoa/restart_browser.h"
33 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" 33 #include "chrome/browser/ui/cocoa/status_bubble_mac.h"
34 #include "chrome/browser/ui/cocoa/task_manager_mac.h" 34 #include "chrome/browser/ui/cocoa/task_manager_mac.h"
35 #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" 35 #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h"
36 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 36 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
37 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 37 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
38 #include "chrome/common/native_web_keyboard_event.h" 38 #include "chrome/common/native_web_keyboard_event.h"
39 #include "chrome/common/notification_service.h"
40 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
41 #include "content/browser/tab_contents/tab_contents.h" 40 #include "content/browser/tab_contents/tab_contents.h"
41 #include "content/common/notification_service.h"
42 #include "grit/chromium_strings.h" 42 #include "grit/chromium_strings.h"
43 #include "grit/generated_resources.h" 43 #include "grit/generated_resources.h"
44 #include "ui/base/l10n/l10n_util_mac.h" 44 #include "ui/base/l10n/l10n_util_mac.h"
45 #include "ui/gfx/rect.h" 45 #include "ui/gfx/rect.h"
46 46
47 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, 47 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser,
48 BrowserWindowController* controller, 48 BrowserWindowController* controller,
49 NSWindow* window) 49 NSWindow* window)
50 : browser_(browser), 50 : browser_(browser),
51 controller_(controller), 51 controller_(controller),
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 620
621 NSWindow* BrowserWindowCocoa::window() const { 621 NSWindow* BrowserWindowCocoa::window() const {
622 return [controller_ window]; 622 return [controller_ window];
623 } 623 }
624 624
625 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { 625 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
626 if (tab_contents == browser_->GetSelectedTabContents()) { 626 if (tab_contents == browser_->GetSelectedTabContents()) {
627 [controller_ updateSidebarForContents:tab_contents]; 627 [controller_ updateSidebarForContents:tab_contents];
628 } 628 }
629 } 629 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698