Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: chrome/browser/dom_ui/dom_ui_theme_source.h

Issue 164376: Merge 22613 - Apply theme to incognito NTP.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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/browser_resources.grd ('k') | chrome/browser/dom_ui/dom_ui_theme_source.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/chrome/browser/dom_ui/dom_ui_theme_source.h:r69-2775
Merged /trunk/src/chrome/browser/dom_ui/dom_ui_theme_source.h:r22613
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_DOM_UI_DOM_UI_THEME_SOURCE_H_ 5 #ifndef CHROME_BROWSER_DOM_UI_DOM_UI_THEME_SOURCE_H_
6 #define CHROME_BROWSER_DOM_UI_DOM_UI_THEME_SOURCE_H_ 6 #define CHROME_BROWSER_DOM_UI_DOM_UI_THEME_SOURCE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 10 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
(...skipping 10 matching lines...) Expand all
21 // the path we registered. 21 // the path we registered.
22 virtual void StartDataRequest(const std::string& path, int request_id); 22 virtual void StartDataRequest(const std::string& path, int request_id);
23 virtual std::string GetMimeType(const std::string& path) const; 23 virtual std::string GetMimeType(const std::string& path) const;
24 24
25 virtual void SendResponse(int request_id, RefCountedBytes* data); 25 virtual void SendResponse(int request_id, RefCountedBytes* data);
26 26
27 private: 27 private:
28 // Generate and send the CSS for the new tab. 28 // Generate and send the CSS for the new tab.
29 void SendNewTabCSS(int request_id); 29 void SendNewTabCSS(int request_id);
30 30
31 // Generate and send the CSS for the new incognito tab.
32 void SendNewIncognitoTabCSS(int request_id);
33
31 // Fetch and send the theme bitmap. 34 // Fetch and send the theme bitmap.
32 void SendThemeBitmap(int request_id, int resource_id); 35 void SendThemeBitmap(int request_id, int resource_id);
33 36
34 // Get the CSS string for the background position on the new tab page for the 37 // Get the CSS string for the background position on the new tab page for the
35 // states when the bar is attached or detached. 38 // states when the bar is attached or detached.
36 std::string GetNewTabBackgroundCSS(bool bar_attached); 39 std::string GetNewTabBackgroundCSS(bool bar_attached);
37 40
38 // How the background image on the new tab page should be tiled (see tiling 41 // How the background image on the new tab page should be tiled (see tiling
39 // masks in browser_theme_provider.h). 42 // masks in browser_theme_provider.h).
40 std::string GetNewTabBackgroundTilingCSS(); 43 std::string GetNewTabBackgroundTilingCSS();
41 44
42 Profile* profile_; 45 Profile* profile_;
43 DISALLOW_COPY_AND_ASSIGN(DOMUIThemeSource); 46 DISALLOW_COPY_AND_ASSIGN(DOMUIThemeSource);
44 }; 47 };
45 48
46 #endif // CHROME_BROWSER_DOM_UI_DOM_UI_THEME_SOURCE_H_ 49 #endif // CHROME_BROWSER_DOM_UI_DOM_UI_THEME_SOURCE_H_
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/dom_ui/dom_ui_theme_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698