chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc - Issue 11229041: Rename and move Ash window frame files

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/frame/browser_non_client_frame_view_ash.cc

Issue 11229041: Rename and move Ash window frame files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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

« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.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/ash/browser_non_client_frame_view_ash.h"	5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"

6	6

7 #include "ash/wm/frame_painter.h"	7 #include "ash/wm/frame_painter.h"

8 #include "ash/wm/workspace/frame_maximize_button.h"	8 #include "ash/wm/workspace/frame_maximize_button.h"

9 #include "chrome/browser/themes/theme_service.h"	9 #include "chrome/browser/themes/theme_service.h"

10 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

11 #include "chrome/browser/ui/ntp_background_util.h"	11 #include "chrome/browser/ui/ntp_background_util.h"

12 #include "chrome/browser/ui/search/search.h"	12 #include "chrome/browser/ui/search/search.h"

13 #include "chrome/browser/ui/search/search_delegate.h"	13 #include "chrome/browser/ui/search/search_delegate.h"

14 #include "chrome/browser/ui/search/search_model.h"	14 #include "chrome/browser/ui/search/search_model.h"

15 #include "chrome/browser/ui/search/search_ui.h"	15 #include "chrome/browser/ui/search/search_ui.h"

(...skipping 610 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
626 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {	626 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {

627 ui::ThemeProvider* tp = GetThemeProvider();	627 ui::ThemeProvider* tp = GetThemeProvider();

628 if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&	628 if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&

629 browser_view()->IsBrowserTypeNormal() &&	629 browser_view()->IsBrowserTypeNormal() &&

630 !browser_view()->IsOffTheRecord()) {	630 !browser_view()->IsOffTheRecord()) {

631 return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?	631 return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?

632 IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);	632 IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);

633 }	633 }

634 return NULL;	634 return NULL;

635 }	635 }

OLD	NEW