chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc - Issue 400543002: MacViews: Fix BrowserClient for toolkit-views on Mac

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Issue 400543002: MacViews: Fix BrowserClient for toolkit-views on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: -chrome_views_delegate Created 6 years, 5 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

« chrome/browser/chrome_content_browser_client.cc ('K') | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h ('k') | no next file » | no next file with comments »

OLD	NEW
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 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"	5 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"

6	6

7 #include "chrome/browser/chrome_browser_main.h"

8 #include "chrome/browser/ui/views/chrome_views_delegate.h"	7 #include "chrome/browser/ui/views/chrome_views_delegate.h"

9 #include "chrome/common/chrome_switches.h"

10 #include "ui/base/ui_base_switches.h"

11 #include "ui/wm/core/wm_state.h"

12	8

13 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {	9 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {

14 }	10 }

15	11

16 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {	12 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {

17 }	13 }

18	14

19 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {	15 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {

20 // The delegate needs to be set before any UI is created so that windows	16 // The delegate needs to be set before any UI is created so that windows

21 // display the correct icon.	17 // display the correct icon.

22 if (!views::ViewsDelegate::views_delegate)	18 if (!views::ViewsDelegate::views_delegate)

23 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;	19 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;

24

25 wm_state_.reset(new wm::WMState);

26 }	20 }

OLD	NEW