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

Side by Side Diff: chrome/browser/ui/cocoa/dev_tools_controller.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/dev_tools_controller.h" 5 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include <Cocoa/Cocoa.h> 10 #include <Cocoa/Cocoa.h>
11 11
12 #include "base/prefs/pref_service.h"
13 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
15 #import "chrome/browser/ui/cocoa/view_id_util.h" 14 #import "chrome/browser/ui/cocoa/view_id_util.h"
15 #include "components/prefs/pref_service.h"
16 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
17 #include "ui/base/cocoa/base_view.h" 17 #include "ui/base/cocoa/base_view.h"
18 #include "ui/base/cocoa/focus_tracker.h" 18 #include "ui/base/cocoa/focus_tracker.h"
19 #include "ui/gfx/geometry/size_conversions.h" 19 #include "ui/gfx/geometry/size_conversions.h"
20 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h" 20 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"
21 21
22 using content::WebContents; 22 using content::WebContents;
23 23
24 @interface DevToolsContainerView : BaseView { 24 @interface DevToolsContainerView : BaseView {
25 DevToolsContentsResizingStrategy strategy_; 25 DevToolsContentsResizingStrategy strategy_;
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 contents->SetAllowOtherViews(false); 154 contents->SetAllowOtherViews(false);
155 } 155 }
156 156
157 BOOL result = [devToolsContainerView_ setDevToolsView:devToolsView 157 BOOL result = [devToolsContainerView_ setDevToolsView:devToolsView
158 withStrategy:strategy]; 158 withStrategy:strategy];
159 [devToolsContainerView_ adjustSubviews]; 159 [devToolsContainerView_ adjustSubviews];
160 return result; 160 return result;
161 } 161 }
162 162
163 @end 163 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm ('k') | chrome/browser/ui/cocoa/first_run_dialog.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698