chrome/browser/ui/views/chrome_views_delegate.cc - Issue 1658793002: Update chrome for new prefs location.

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_views_delegate.cc

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

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc ('k') | chrome/browser/ui/views/collected_cookies_views.cc » ('j') | 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_views_delegate.h"	5 #include "chrome/browser/ui/views/chrome_views_delegate.h"

6	6

7 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

8 #include "base/prefs/pref_service.h"

9 #include "base/prefs/scoped_user_pref_update.h"

10 #include "base/strings/string_util.h"	8 #include "base/strings/string_util.h"

11 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

12 #include "base/time/time.h"	10 #include "base/time/time.h"

13 #include "build/build_config.h"	11 #include "build/build_config.h"

14 #include "chrome/browser/browser_process.h"	12 #include "chrome/browser/browser_process.h"

15 #include "chrome/browser/profiles/profile_manager.h"	13 #include "chrome/browser/profiles/profile_manager.h"

16 #include "chrome/browser/ui/browser_window_state.h"	14 #include "chrome/browser/ui/browser_window_state.h"

	15 #include "components/prefs/pref_service.h"

	16 #include "components/prefs/scoped_user_pref_update.h"

17 #include "components/version_info/version_info.h"	17 #include "components/version_info/version_info.h"

18 #include "content/public/browser/browser_thread.h"	18 #include "content/public/browser/browser_thread.h"

19 #include "content/public/browser/context_factory.h"	19 #include "content/public/browser/context_factory.h"

20 #include "grit/chrome_unscaled_resources.h"	20 #include "grit/chrome_unscaled_resources.h"

21 #include "ui/base/resource/resource_bundle.h"	21 #include "ui/base/resource/resource_bundle.h"

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

23 #include "ui/gfx/geometry/rect.h"	23 #include "ui/gfx/geometry/rect.h"

24 #include "ui/gfx/screen.h"	24 #include "ui/gfx/screen.h"

25 #include "ui/views/controls/menu/menu_controller.h"	25 #include "ui/views/controls/menu/menu_controller.h"

26 #include "ui/views/widget/native_widget.h"	26 #include "ui/views/widget/native_widget.h"

(...skipping 475 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
502 return content::BrowserThread::GetBlockingPool();	502 return content::BrowserThread::GetBlockingPool();

503 }	503 }

504	504

505 #if !defined(USE_ASH)	505 #if !defined(USE_ASH)

506 views::Widget::InitParams::WindowOpacity	506 views::Widget::InitParams::WindowOpacity

507 ChromeViewsDelegate::GetOpacityForInitParams(	507 ChromeViewsDelegate::GetOpacityForInitParams(

508 const views::Widget::InitParams& params) {	508 const views::Widget::InitParams& params) {

509 return views::Widget::InitParams::OPAQUE_WINDOW;	509 return views::Widget::InitParams::OPAQUE_WINDOW;

510 }	510 }

511 #endif	511 #endif

OLD	NEW