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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_private.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #import "base/auto_reset.h" 9 #import "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/mac/bind_objc_block.h" 11 #include "base/mac/bind_objc_block.h"
12 #include "base/mac/foundation_util.h" 12 #include "base/mac/foundation_util.h"
13 #include "base/mac/mac_util.h" 13 #include "base/mac/mac_util.h"
14 #import "base/mac/scoped_nsobject.h" 14 #import "base/mac/scoped_nsobject.h"
15 #import "base/mac/sdk_forward_declarations.h" 15 #import "base/mac/sdk_forward_declarations.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/prefs/pref_service.h"
18 #include "base/prefs/scoped_user_pref_update.h"
19 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/fullscreen.h" 18 #include "chrome/browser/fullscreen.h"
21 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/profiles/profile_avatar_icon_util.h" 20 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
23 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 21 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
24 #include "chrome/browser/ui/browser.h" 22 #include "chrome/browser/ui/browser.h"
25 #include "chrome/browser/ui/browser_window_state.h" 23 #include "chrome/browser/ui/browser_window_state.h"
26 #import "chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h" 24 #import "chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h"
27 #import "chrome/browser/ui/cocoa/browser_window_layout.h" 25 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
28 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con troller.h" 26 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con troller.h"
(...skipping 11 matching lines...) Expand all
40 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" 38 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h"
41 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" 39 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
42 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" 40 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
43 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 41 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
44 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 42 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
45 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h" 43 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
46 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 44 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
47 #include "chrome/browser/ui/tabs/tab_strip_model.h" 45 #include "chrome/browser/ui/tabs/tab_strip_model.h"
48 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" 46 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
49 #include "chrome/common/chrome_switches.h" 47 #include "chrome/common/chrome_switches.h"
48 #include "components/prefs/pref_service.h"
49 #include "components/prefs/scoped_user_pref_update.h"
50 #include "content/public/browser/render_widget_host_view.h" 50 #include "content/public/browser/render_widget_host_view.h"
51 #include "content/public/browser/web_contents.h" 51 #include "content/public/browser/web_contents.h"
52 #import "ui/base/cocoa/focus_tracker.h" 52 #import "ui/base/cocoa/focus_tracker.h"
53 #import "ui/base/cocoa/nsview_additions.h" 53 #import "ui/base/cocoa/nsview_additions.h"
54 #include "ui/base/ui_base_types.h" 54 #include "ui/base/ui_base_types.h"
55 55
56 using content::RenderWidgetHostView; 56 using content::RenderWidgetHostView;
57 using content::WebContents; 57 using content::WebContents;
58 58
59 namespace { 59 namespace {
(...skipping 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 return nil; 1267 return nil;
1268 } 1268 }
1269 1269
1270 - (BOOL)isFullscreenForTabContent { 1270 - (BOOL)isFullscreenForTabContent {
1271 return browser_->exclusive_access_manager() 1271 return browser_->exclusive_access_manager()
1272 ->fullscreen_controller() 1272 ->fullscreen_controller()
1273 ->IsWindowFullscreenForTabOrPending(); 1273 ->IsWindowFullscreenForTabOrPending();
1274 } 1274 }
1275 1275
1276 @end // @implementation BrowserWindowController(Private) 1276 @end // @implementation BrowserWindowController(Private)
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698