chrome/browser/ui/views/frame/browser_frame.h - Issue 1492423003: Rejigger ThemeService: move exposure of ThemeProvider interface to a

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_frame.h

Issue 1492423003: Rejigger ThemeService: move exposure of ThemeProvider interface to a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix that unittest Created 5 years 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

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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_

6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_	6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_

7	7

8 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "build/build_config.h"	10 #include "build/build_config.h"

(...skipping 130 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141	141

142 // Used to show the system menu. Only used if	142 // Used to show the system menu. Only used if

143 // NativeBrowserFrame::UsesNativeSystemMenu() returns false.	143 // NativeBrowserFrame::UsesNativeSystemMenu() returns false.

144 scoped_ptr<views::MenuRunner> menu_runner_;	144 scoped_ptr<views::MenuRunner> menu_runner_;

145	145

146 // SetThemeProvider() triggers setting both \|owned_theme_provider_\| and	146 // SetThemeProvider() triggers setting both \|owned_theme_provider_\| and

147 // \|theme_provider_\|. Initially \|theme_provider_\| is set to the ThemeService	147 // \|theme_provider_\|. Initially \|theme_provider_\| is set to the ThemeService

148 // and \|owned_theme_provider_\| is null (as ThemeServices lifetime is managed	148 // and \|owned_theme_provider_\| is null (as ThemeServices lifetime is managed

149 // externally).	149 // externally).

150 scoped_ptr<ui::ThemeProvider> owned_theme_provider_;	150 scoped_ptr<ui::ThemeProvider> owned_theme_provider_;

151 ui::ThemeProvider* theme_provider_;	151 const ui::ThemeProvider* theme_provider_;

152	152

153 scoped_ptr<ui::EventHandler> browser_command_handler_;	153 scoped_ptr<ui::EventHandler> browser_command_handler_;

154	154

155 DISALLOW_COPY_AND_ASSIGN(BrowserFrame);	155 DISALLOW_COPY_AND_ASSIGN(BrowserFrame);

156 };	156 };

157	157

158 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_	158 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_

OLD	NEW