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

Issue 12303030: Merge 182576 to M26 beta branch. (Closed)

Created:
7 years, 10 months ago by Matt Perry
Modified:
7 years, 10 months ago
Reviewers:
mhx348
CC:
chromium-reviews, Aaron Boodman, tfarina, arv+watch_chromium.org, sail+watch_chromium.org, chromium-apps-reviews_chromium.org
Visibility:
Public.

Description

Merge 182576 to M26 beta branch. > Re-land "view permission" feature (r179916) with Mac Fix. > > The feature review URL: http://crrev.com/12094034 > Mac fix review URL: http://crrev.com/12258023 > This CL also combines the extension_install_prompt changes reviewed at http://crrev.com/12220142 > > RootCause for Mac failure: Permission Prompt does not have a OK button. > And Chrome hangs while trying to create a OK button with empty string. > Solution: Remove |okButton_| when its title is empty and adjust > |cancelButton_|'s position. > The screenshot with the fix is uploaded at http://crbug.com/175071#c15 > > BUG=170742, 175071 > TBR=finnur@chromium.org > TBR=sky@chromium.org for http://crrev.com/12094034 > TBR=sail@chromium.org for http://crrev.com/12258023 > > > Review URL: https://chromiumcodereview.appspot.com/12212195 TBR=MHX348@motorola.com Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183258

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+202 lines, -10 lines) Patch
M chrome/app/generated_resources.grd View 4 chunks +14 lines, -1 line 0 comments Download
M chrome/browser/extensions/extension_install_prompt.h View 3 chunks +10 lines, -0 lines 0 comments Download
M chrome/browser/extensions/extension_install_prompt.cc View 9 chunks +36 lines, -1 line 0 comments Download
M chrome/browser/resources/extensions/extension_list.js View 2 chunks +8 lines, -1 line 0 comments Download
M chrome/browser/resources/extensions/extensions.html View 1 chunk +4 lines, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm View 1 chunk +24 lines, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h View 1 chunk +3 lines, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm View 1 chunk +9 lines, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm View 2 chunks +24 lines, -7 lines 0 comments Download
M chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm View 1 chunk +24 lines, -0 lines 0 comments Download
M chrome/browser/ui/views/extensions/extension_install_dialog_view.cc View 2 chunks +9 lines, -0 lines 0 comments Download
M chrome/browser/ui/webui/extensions/extension_settings_handler.h View 5 chunks +12 lines, -0 lines 0 comments Download
M chrome/browser/ui/webui/extensions/extension_settings_handler.cc View 4 chunks +25 lines, -0 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
Matt Perry
7 years, 10 months ago (2013-02-19 18:54:32 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698