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

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

Issue 11302: fix pan scrolling (Closed)
Patch Set: add file Created 12 years, 1 month 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 | « no previous file | webkit/glue/resources/README.txt » ('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) 2008 The Chromium Authors. All rights reserved. Use of this 1 // Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this
2 // source code is governed by a BSD-style license that can be found in the 2 // source code is governed by a BSD-style license that can be found in the
3 // LICENSE file. 3 // LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "ChromiumBridge.h" 6 #include "ChromiumBridge.h"
7 7
8 #include "BitmapImage.h" 8 #include "BitmapImage.h"
9 #include "ClipboardUtilitiesChromium.h" 9 #include "ClipboardUtilitiesChromium.h"
10 #include "Cursor.h" 10 #include "Cursor.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 return Image::nullImage(); 364 return Image::nullImage();
365 #endif 365 #endif
366 } 366 }
367 367
368 // The rest get converted to a resource ID that we can pass to the glue. 368 // The rest get converted to a resource ID that we can pass to the glue.
369 int resource_id = 0; 369 int resource_id = 0;
370 if (!strcmp(name, "missingImage")) { 370 if (!strcmp(name, "missingImage")) {
371 resource_id = IDR_BROKENIMAGE; 371 resource_id = IDR_BROKENIMAGE;
372 } else if (!strcmp(name, "tickmarkDash")) { 372 } else if (!strcmp(name, "tickmarkDash")) {
373 resource_id = IDR_TICKMARK_DASH; 373 resource_id = IDR_TICKMARK_DASH;
374 } else if (!strcmp(name, "panIcon")) {
375 resource_id = IDR_PAN_SCROLL_ICON;
374 } else if (!strcmp(name, "deleteButton") || 376 } else if (!strcmp(name, "deleteButton") ||
375 !strcmp(name, "deleteButtonPressed")) { 377 !strcmp(name, "deleteButtonPressed")) {
376 NOTREACHED() << "Image resource " << name << " does not exist yet."; 378 NOTREACHED() << "Image resource " << name << " does not exist yet.";
377 return Image::nullImage(); 379 return Image::nullImage();
378 } else { 380 } else {
379 NOTREACHED() << "Unknown image resource " << name; 381 NOTREACHED() << "Unknown image resource " << name;
380 return Image::nullImage(); 382 return Image::nullImage();
381 } 383 }
382 384
383 std::string data = webkit_glue::GetDataResource(resource_id); 385 std::string data = webkit_glue::GetDataResource(resource_id);
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 chrome_client->SetCursor(WebCursor(cursor.impl())); 526 chrome_client->SetCursor(WebCursor(cursor.impl()));
525 } 527 }
526 528
527 void ChromiumBridge::widgetSetFocus(Widget* widget) { 529 void ChromiumBridge::widgetSetFocus(Widget* widget) {
528 ChromeClientImpl* chrome_client = ToChromeClient(widget); 530 ChromeClientImpl* chrome_client = ToChromeClient(widget);
529 if (chrome_client) 531 if (chrome_client)
530 chrome_client->focus(); 532 chrome_client->focus();
531 } 533 }
532 534
533 } // namespace WebCore 535 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | webkit/glue/resources/README.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698