OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/extensions/extension_menu_manager.h" | 5 #include "chrome/browser/extensions/extension_menu_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
398 switch (params.media_type) { | 398 switch (params.media_type) { |
399 case WebKit::WebContextMenuData::MediaTypeImage: | 399 case WebKit::WebContextMenuData::MediaTypeImage: |
400 properties->SetString("mediaType", "image"); | 400 properties->SetString("mediaType", "image"); |
401 break; | 401 break; |
402 case WebKit::WebContextMenuData::MediaTypeVideo: | 402 case WebKit::WebContextMenuData::MediaTypeVideo: |
403 properties->SetString("mediaType", "video"); | 403 properties->SetString("mediaType", "video"); |
404 break; | 404 break; |
405 case WebKit::WebContextMenuData::MediaTypeAudio: | 405 case WebKit::WebContextMenuData::MediaTypeAudio: |
406 properties->SetString("mediaType", "audio"); | 406 properties->SetString("mediaType", "audio"); |
407 break; | 407 break; |
408 case WebKit::WebContextMenuData::MediaTypeFile: | |
409 properties->SetString("mediaType", "file"); | |
asargent_no_longer_on_chrome
2011/04/12 21:09:38
I think you can remove this change, since you're d
zel
2011/04/13 17:49:55
Yes, this file should have been reverted. Done now
| |
410 break; | |
408 default: {} // Do nothing. | 411 default: {} // Do nothing. |
409 } | 412 } |
410 | 413 |
411 AddURLProperty(properties, "linkUrl", params.unfiltered_link_url); | 414 AddURLProperty(properties, "linkUrl", params.unfiltered_link_url); |
412 AddURLProperty(properties, "srcUrl", params.src_url); | 415 AddURLProperty(properties, "srcUrl", params.src_url); |
413 AddURLProperty(properties, "pageUrl", params.page_url); | 416 AddURLProperty(properties, "pageUrl", params.page_url); |
414 AddURLProperty(properties, "frameUrl", params.frame_url); | 417 AddURLProperty(properties, "frameUrl", params.frame_url); |
415 | 418 |
416 if (params.selection_text.length() > 0) | 419 if (params.selection_text.length() > 0) |
417 properties->SetString("selectionText", params.selection_text); | 420 properties->SetString("selectionText", params.selection_text); |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
501 if (profile < other.profile) | 504 if (profile < other.profile) |
502 return true; | 505 return true; |
503 if (profile == other.profile) { | 506 if (profile == other.profile) { |
504 if (extension_id < other.extension_id) | 507 if (extension_id < other.extension_id) |
505 return true; | 508 return true; |
506 if (extension_id == other.extension_id) | 509 if (extension_id == other.extension_id) |
507 return uid < other.uid; | 510 return uid < other.uid; |
508 } | 511 } |
509 return false; | 512 return false; |
510 } | 513 } |
OLD | NEW |