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

Side by Side Diff: chrome/browser/browser_theme_provider.cc

Issue 3035034: Modified resources for M6 theme. This doesn't actually modify layout yet, ju... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser_theme_provider.h" 5 #include "chrome/browser/browser_theme_provider.h"
6 6
7 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/browser_theme_pack.h" 9 #include "chrome/browser/browser_theme_pack.h"
10 #include "chrome/browser/extensions/extensions_service.h" 10 #include "chrome/browser/extensions/extensions_service.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // browser_theme_pack.cc, and you should assign persistent IDs to the 139 // browser_theme_pack.cc, and you should assign persistent IDs to the
140 // data table at the start of said file or else tinted versions of 140 // data table at the start of said file or else tinted versions of
141 // these resources will not be created. 141 // these resources will not be created.
142 const int kToolbarButtonIDs[] = { 142 const int kToolbarButtonIDs[] = {
143 IDR_BACK, IDR_BACK_D, IDR_BACK_H, IDR_BACK_P, 143 IDR_BACK, IDR_BACK_D, IDR_BACK_H, IDR_BACK_P,
144 IDR_FORWARD, IDR_FORWARD_D, IDR_FORWARD_H, IDR_FORWARD_P, 144 IDR_FORWARD, IDR_FORWARD_D, IDR_FORWARD_H, IDR_FORWARD_P,
145 IDR_HOME, IDR_HOME_H, IDR_HOME_P, 145 IDR_HOME, IDR_HOME_H, IDR_HOME_P,
146 IDR_RELOAD, IDR_RELOAD_H, IDR_RELOAD_P, 146 IDR_RELOAD, IDR_RELOAD_H, IDR_RELOAD_P,
147 IDR_STOP, IDR_STOP_H, IDR_STOP_P, 147 IDR_STOP, IDR_STOP_H, IDR_STOP_P,
148 IDR_LOCATIONBG_C, IDR_LOCATIONBG_L, IDR_LOCATIONBG_R, 148 IDR_LOCATIONBG_C, IDR_LOCATIONBG_L, IDR_LOCATIONBG_R,
149 IDR_TOOLS, 149 IDR_BROWSER_ACTIONS_OVERFLOW, IDR_BROWSER_ACTIONS_OVERFLOW_H,
150 IDR_BROWSER_ACTIONS_OVERFLOW_P,
151 IDR_TOOLS, IDR_TOOLS_H, IDR_TOOLS_P,
150 IDR_MENU_DROPARROW, 152 IDR_MENU_DROPARROW,
151 IDR_THROBBER, IDR_THROBBER_WAITING, IDR_THROBBER_LIGHT, 153 IDR_THROBBER, IDR_THROBBER_WAITING, IDR_THROBBER_LIGHT,
152 }; 154 };
153 155
154 // Writes the theme pack to disk on a separate thread. 156 // Writes the theme pack to disk on a separate thread.
155 class WritePackToDiskTask : public Task { 157 class WritePackToDiskTask : public Task {
156 public: 158 public:
157 WritePackToDiskTask(BrowserThemePack* pack, const FilePath& path) 159 WritePackToDiskTask(BrowserThemePack* pack, const FilePath& path)
158 : theme_pack_(pack), pack_path_(path) {} 160 : theme_pack_(pack), pack_path_(path) {}
159 161
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 void BrowserThemeProvider::OnInfobarDisplayed() { 596 void BrowserThemeProvider::OnInfobarDisplayed() {
595 number_of_infobars_++; 597 number_of_infobars_++;
596 } 598 }
597 599
598 void BrowserThemeProvider::OnInfobarDestroyed() { 600 void BrowserThemeProvider::OnInfobarDestroyed() {
599 number_of_infobars_--; 601 number_of_infobars_--;
600 602
601 if (number_of_infobars_ == 0) 603 if (number_of_infobars_ == 0)
602 RemoveUnusedThemes(); 604 RemoveUnusedThemes();
603 } 605 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_theme_pack.cc ('k') | chrome/browser/cocoa/location_bar/selected_keyword_decoration.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698