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

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

Issue 1105423003: Mac: Don't update prefs file unnecessarily when activating windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@perf.cpu_usage
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <numeric> 8 #include <numeric>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #import "chrome/browser/ui/cocoa/browser_window_utils.h" 48 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
49 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" 49 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
50 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" 50 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
51 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa .h" 51 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa .h"
52 #import "chrome/browser/ui/cocoa/fast_resize_view.h" 52 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
53 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" 53 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
54 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" 54 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
55 #import "chrome/browser/ui/cocoa/framed_browser_window.h" 55 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
56 #import "chrome/browser/ui/cocoa/fullscreen_window.h" 56 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
57 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" 57 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
58 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
58 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" 59 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
59 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" 60 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
60 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" 61 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
61 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" 62 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
62 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" 63 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h"
63 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" 64 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
64 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" 65 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
65 #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h" 66 #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
66 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" 67 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
67 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" 68 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 [[self window] orderOut:self]; 584 [[self window] orderOut:self];
584 return NO; 585 return NO;
585 } 586 }
586 587
587 // the tab strip is empty, it's ok to close the window 588 // the tab strip is empty, it's ok to close the window
588 return YES; 589 return YES;
589 } 590 }
590 591
591 // Called right after our window became the main window. 592 // Called right after our window became the main window.
592 - (void)windowDidBecomeMain:(NSNotification*)notification { 593 - (void)windowDidBecomeMain:(NSNotification*)notification {
593 BrowserList::SetLastActive(browser_.get()); 594 if (chrome::GetLastActiveBrowser() != browser_) {
594 [self saveWindowPositionIfNeeded]; 595 BrowserList::SetLastActive(browser_.get());
596 [self saveWindowPositionIfNeeded];
597 }
595 598
596 [[[self window] contentView] cr_recursivelyInvokeBlock:^(id view) { 599 [[[self window] contentView] cr_recursivelyInvokeBlock:^(id view) {
597 if ([view conformsToProtocol:@protocol(ThemedWindowDrawing)]) 600 if ([view conformsToProtocol:@protocol(ThemedWindowDrawing)])
598 [view windowDidChangeActive]; 601 [view windowDidChangeActive];
599 }]; 602 }];
600 603
601 extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile()) 604 extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile())
602 ->set_registry_for_active_window(extension_keybinding_registry_.get()); 605 ->set_registry_for_active_window(extension_keybinding_registry_.get());
603 } 606 }
604 607
(...skipping 1614 matching lines...) Expand 10 before | Expand all | Expand 10 after
2219 2222
2220 - (BOOL)supportsBookmarkBar { 2223 - (BOOL)supportsBookmarkBar {
2221 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2224 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2222 } 2225 }
2223 2226
2224 - (BOOL)isTabbedWindow { 2227 - (BOOL)isTabbedWindow {
2225 return browser_->is_type_tabbed(); 2228 return browser_->is_type_tabbed();
2226 } 2229 }
2227 2230
2228 @end // @implementation BrowserWindowController(WindowType) 2231 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698