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

Side by Side Diff: webkit/glue/webkitclient_impl.cc

Issue 2478002: Added resource images for progress bar. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Updated images to simple one; this will be used until the theme integration is available. Created 10 years, 6 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 | « webkit/glue/webkit_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "webkit/glue/webkitclient_impl.h" 5 #include "webkit/glue/webkitclient_impl.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <malloc.h> 8 #include <malloc.h>
9 #endif 9 #endif
10 10
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 #if defined(OS_POSIX) && !defined(OS_MACOSX) 255 #if defined(OS_POSIX) && !defined(OS_MACOSX)
256 // TODO(port): rename these to "skia" instead of "Linux". 256 // TODO(port): rename these to "skia" instead of "Linux".
257 { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF }, 257 { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF },
258 { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON }, 258 { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON },
259 { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF }, 259 { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF },
260 { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON }, 260 { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON },
261 { "linuxRadioOff", IDR_LINUX_RADIO_OFF }, 261 { "linuxRadioOff", IDR_LINUX_RADIO_OFF },
262 { "linuxRadioOn", IDR_LINUX_RADIO_ON }, 262 { "linuxRadioOn", IDR_LINUX_RADIO_ON },
263 { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF }, 263 { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF },
264 { "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON }, 264 { "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON },
265 { "linuxProgressBar", IDR_PROGRESS_BAR },
266 { "linuxProgressValue", IDR_PROGRESS_VALUE },
267 { "linuxProgressBorderLeft", IDR_PROGRESS_BORDER_LEFT },
268 { "linuxProgressBorderRight", IDR_PROGRESS_BORDER_RIGHT },
269
265 #endif 270 #endif
266 }; 271 };
267 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) { 272 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) {
268 if (!strcmp(name, resources[i].name)) { 273 if (!strcmp(name, resources[i].name)) {
269 base::StringPiece resource = GetDataResource(resources[i].id); 274 base::StringPiece resource = GetDataResource(resources[i].id);
270 return WebData(resource.data(), resource.size()); 275 return WebData(resource.data(), resource.size());
271 } 276 }
272 } 277 }
273 NOTREACHED() << "Unknown image resource " << name; 278 NOTREACHED() << "Unknown image resource " << name;
274 return WebData(); 279 return WebData();
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 ++shared_timer_suspended_; 428 ++shared_timer_suspended_;
424 } 429 }
425 430
426 void WebKitClientImpl::ResumeSharedTimer() { 431 void WebKitClientImpl::ResumeSharedTimer() {
427 // The shared timer may have fired or been adjusted while we were suspended. 432 // The shared timer may have fired or been adjusted while we were suspended.
428 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) 433 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
429 setSharedTimerFireTime(shared_timer_fire_time_); 434 setSharedTimerFireTime(shared_timer_fire_time_);
430 } 435 }
431 436
432 } // namespace webkit_glue 437 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698