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

Side by Side Diff: chrome/browser/extensions/extension_file_browser_private_api.cc

Issue 7553020: Revert 94715 - Revert 94714 - Improve layout for bookmark-apps. Add treatment for small icons. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merging to head Created 9 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_management_api.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) 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_file_browser_private_api.h" 5 #include "chrome/browser/extensions/extension_file_browser_private_api.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 DictionaryValue* task = new DictionaryValue(); 547 DictionaryValue* task = new DictionaryValue();
548 task->SetString("taskId", MakeTaskID(extension_id.data(), 548 task->SetString("taskId", MakeTaskID(extension_id.data(),
549 iter->second->id().data())); 549 iter->second->id().data()));
550 task->SetString("title", iter->second->title()); 550 task->SetString("title", iter->second->title());
551 // TODO(zelidrag): Figure out how to expose icon URL that task defined in 551 // TODO(zelidrag): Figure out how to expose icon URL that task defined in
552 // manifest instead of the default extension icon. 552 // manifest instead of the default extension icon.
553 GURL icon = 553 GURL icon =
554 ExtensionIconSource::GetIconURL(extension, 554 ExtensionIconSource::GetIconURL(extension,
555 Extension::EXTENSION_ICON_BITTY, 555 Extension::EXTENSION_ICON_BITTY,
556 ExtensionIconSet::MATCH_BIGGER, 556 ExtensionIconSet::MATCH_BIGGER,
557 false); // grayscale 557 false, NULL); // grayscale
558 task->SetString("iconUrl", icon.spec()); 558 task->SetString("iconUrl", icon.spec());
559 result_list->Append(task); 559 result_list->Append(task);
560 } 560 }
561 561
562 // TODO(zelidrag, serya): Add intent content tasks to result_list once we 562 // TODO(zelidrag, serya): Add intent content tasks to result_list once we
563 // implement that API. 563 // implement that API.
564 SendResponse(true); 564 SendResponse(true);
565 return true; 565 return true;
566 } 566 }
567 567
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 #undef SET_STRING 1499 #undef SET_STRING
1500 1500
1501 // TODO(serya): Create a new string in .grd file for this one in M13. 1501 // TODO(serya): Create a new string in .grd file for this one in M13.
1502 dict->SetString("PREVIEW_IMAGE", 1502 dict->SetString("PREVIEW_IMAGE",
1503 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON)); 1503 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON));
1504 dict->SetString("PLAY_MEDIA", 1504 dict->SetString("PLAY_MEDIA",
1505 l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLAY)); 1505 l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLAY));
1506 1506
1507 return true; 1507 return true;
1508 } 1508 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_management_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698