chrome/browser/ui/views/chrome_views_delegate.cc - Issue 533013002: Revert of Convert chrome_unscaled_resources to use a qualified path.

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 533013002: Revert of Convert chrome_unscaled_resources to use a qualified path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/cocoa/status_icons/status_icon_mac_unittest.mm ('k') | chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"	8 #include "base/prefs/pref_service.h"

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

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

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

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

13 #include "chrome/app/theme/grit/chrome_unscaled_resources.h"

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

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

16 #include "chrome/browser/ui/views/accessibility/accessibility_event_router_views .h"	15 #include "chrome/browser/ui/views/accessibility/accessibility_event_router_views .h"

17 #include "chrome/common/pref_names.h"	16 #include "chrome/common/pref_names.h"

	17 #include "grit/chrome_unscaled_resources.h"

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

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

20 #include "ui/gfx/rect.h"	20 #include "ui/gfx/rect.h"

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

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

23 #include "ui/views/widget/widget.h"	23 #include "ui/views/widget/widget.h"

24	24

25 #if defined(OS_WIN)	25 #if defined(OS_WIN)

26 #include <dwmapi.h>	26 #include <dwmapi.h>

27 #include <shellapi.h>	27 #include <shellapi.h>

(...skipping 400 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
428 }	428 }

429 #endif	429 #endif

430	430

431 #if !defined(USE_AURA) && !defined(USE_CHROMEOS)	431 #if !defined(USE_AURA) && !defined(USE_CHROMEOS)

432 views::Widget::InitParams::WindowOpacity	432 views::Widget::InitParams::WindowOpacity

433 ChromeViewsDelegate::GetOpacityForInitParams(	433 ChromeViewsDelegate::GetOpacityForInitParams(

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

435 return views::Widget::InitParams::OPAQUE_WINDOW;	435 return views::Widget::InitParams::OPAQUE_WINDOW;

436 }	436 }

437 #endif	437 #endif

OLD	NEW