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

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

Issue 3071003: AutoFill: Display a right-aligned generic CC icon in the suggestions popup for (Closed)
Patch Set: Rebase. 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
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | webkit/glue/webpasswordautocompletelistener_impl.cc » ('j') | 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 void WebKitClientImpl::traceEventEnd(const char* name, void* id, 228 void WebKitClientImpl::traceEventEnd(const char* name, void* id,
229 const char* extra) { 229 const char* extra) {
230 TRACE_EVENT_END(name, id, extra); 230 TRACE_EVENT_END(name, id, extra);
231 } 231 }
232 232
233 WebData WebKitClientImpl::loadResource(const char* name) { 233 WebData WebKitClientImpl::loadResource(const char* name) {
234 struct { 234 struct {
235 const char* name; 235 const char* name;
236 int id; 236 int id;
237 } resources[] = { 237 } resources[] = {
238 { "genericCC", IDR_AUTOFILL_CC_GENERIC },
238 { "missingImage", IDR_BROKENIMAGE }, 239 { "missingImage", IDR_BROKENIMAGE },
239 { "mediaPause", IDR_MEDIA_PAUSE_BUTTON }, 240 { "mediaPause", IDR_MEDIA_PAUSE_BUTTON },
240 { "mediaPlay", IDR_MEDIA_PLAY_BUTTON }, 241 { "mediaPlay", IDR_MEDIA_PLAY_BUTTON },
241 { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED }, 242 { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED },
242 { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED }, 243 { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED },
243 { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON }, 244 { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON },
244 { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON }, 245 { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON },
245 { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB }, 246 { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB },
246 { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB }, 247 { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB },
247 { "panIcon", IDR_PAN_SCROLL_ICON }, 248 { "panIcon", IDR_PAN_SCROLL_ICON },
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 ++shared_timer_suspended_; 433 ++shared_timer_suspended_;
433 } 434 }
434 435
435 void WebKitClientImpl::ResumeSharedTimer() { 436 void WebKitClientImpl::ResumeSharedTimer() {
436 // The shared timer may have fired or been adjusted while we were suspended. 437 // The shared timer may have fired or been adjusted while we were suspended.
437 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) 438 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
438 setSharedTimerFireTime(shared_timer_fire_time_); 439 setSharedTimerFireTime(shared_timer_fire_time_);
439 } 440 }
440 441
441 } // namespace webkit_glue 442 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | webkit/glue/webpasswordautocompletelistener_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698