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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 1570153003: Use MacViews for ContentSettingBubbles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 5 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 21 matching lines...) Expand all
32 #include "chrome/browser/ui/browser_list.h" 32 #include "chrome/browser/ui/browser_list.h"
33 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 33 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
34 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h " 34 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h "
35 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" 35 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
36 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h" 36 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h"
37 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" 37 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
38 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" 38 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
39 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h" 39 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h"
40 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h" 40 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h"
41 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h" 41 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
42 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_decoration.h"
tapted 2016/01/11 02:50:58 do you need to git-add this?
42 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" 43 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"
43 #import "chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h" 44 #import "chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h"
44 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h" 45 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h"
45 #import "chrome/browser/ui/cocoa/location_bar/save_credit_card_decoration.h" 46 #import "chrome/browser/ui/cocoa/location_bar/save_credit_card_decoration.h"
46 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" 47 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
47 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h" 48 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
48 #import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h" 49 #import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h"
49 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" 50 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
50 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 51 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
51 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 52 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 ChromeOmniboxEditController(command_updater), 96 ChromeOmniboxEditController(command_updater),
96 omnibox_view_(new OmniboxViewMac(this, profile, command_updater, field)), 97 omnibox_view_(new OmniboxViewMac(this, profile, command_updater, field)),
97 field_(field), 98 field_(field),
98 location_icon_decoration_(new LocationIconDecoration(this)), 99 location_icon_decoration_(new LocationIconDecoration(this)),
99 selected_keyword_decoration_(new SelectedKeywordDecoration()), 100 selected_keyword_decoration_(new SelectedKeywordDecoration()),
100 ev_bubble_decoration_( 101 ev_bubble_decoration_(
101 new EVBubbleDecoration(location_icon_decoration_.get())), 102 new EVBubbleDecoration(location_icon_decoration_.get())),
102 save_credit_card_decoration_( 103 save_credit_card_decoration_(
103 new SaveCreditCardDecoration(command_updater)), 104 new SaveCreditCardDecoration(command_updater)),
104 star_decoration_(new StarDecoration(command_updater)), 105 star_decoration_(new StarDecoration(command_updater)),
106 test_decoration_(new LocationBarViewDecoration()),
105 translate_decoration_(new TranslateDecoration(command_updater)), 107 translate_decoration_(new TranslateDecoration(command_updater)),
106 zoom_decoration_(new ZoomDecoration(this)), 108 zoom_decoration_(new ZoomDecoration(this)),
107 keyword_hint_decoration_(new KeywordHintDecoration()), 109 keyword_hint_decoration_(new KeywordHintDecoration()),
108 manage_passwords_decoration_( 110 manage_passwords_decoration_(
109 new ManagePasswordsDecoration(command_updater, this)), 111 new ManagePasswordsDecoration(command_updater, this)),
110 browser_(browser), 112 browser_(browser),
111 location_bar_visible_(true), 113 location_bar_visible_(true),
112 weak_ptr_factory_(this) { 114 weak_ptr_factory_(this) {
113 ScopedVector<ContentSettingImageModel> models = 115 ScopedVector<ContentSettingImageModel> models =
114 ContentSettingImageModel::GenerateContentSettingImageModels(); 116 ContentSettingImageModel::GenerateContentSettingImageModels();
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 AutocompleteTextFieldCell* cell = [field_ cell]; 404 AutocompleteTextFieldCell* cell = [field_ cell];
403 405
404 // Reset the left-hand decorations. 406 // Reset the left-hand decorations.
405 // TODO(shess): Shortly, this code will live somewhere else, like in 407 // TODO(shess): Shortly, this code will live somewhere else, like in
406 // the constructor. I am still wrestling with how best to deal with 408 // the constructor. I am still wrestling with how best to deal with
407 // right-hand decorations, which are not a static set. 409 // right-hand decorations, which are not a static set.
408 [cell clearDecorations]; 410 [cell clearDecorations];
409 [cell addLeftDecoration:location_icon_decoration_.get()]; 411 [cell addLeftDecoration:location_icon_decoration_.get()];
410 [cell addLeftDecoration:selected_keyword_decoration_.get()]; 412 [cell addLeftDecoration:selected_keyword_decoration_.get()];
411 [cell addLeftDecoration:ev_bubble_decoration_.get()]; 413 [cell addLeftDecoration:ev_bubble_decoration_.get()];
414 [cell addRightDecoration:test_decoration_.get()];
412 [cell addRightDecoration:star_decoration_.get()]; 415 [cell addRightDecoration:star_decoration_.get()];
413 [cell addRightDecoration:translate_decoration_.get()]; 416 [cell addRightDecoration:translate_decoration_.get()];
414 [cell addRightDecoration:zoom_decoration_.get()]; 417 [cell addRightDecoration:zoom_decoration_.get()];
415 [cell addRightDecoration:save_credit_card_decoration_.get()]; 418 [cell addRightDecoration:save_credit_card_decoration_.get()];
416 [cell addRightDecoration:manage_passwords_decoration_.get()]; 419 [cell addRightDecoration:manage_passwords_decoration_.get()];
417 420
418 // Note that display order is right to left. 421 // Note that display order is right to left.
419 for (size_t i = 0; i < page_action_decorations_.size(); ++i) { 422 for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
420 [cell addRightDecoration:page_action_decorations_[i]]; 423 [cell addRightDecoration:page_action_decorations_[i]];
421 } 424 }
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 733
731 return zoom_decoration_->UpdateIfNecessary( 734 return zoom_decoration_->UpdateIfNecessary(
732 ui_zoom::ZoomController::FromWebContents(web_contents), 735 ui_zoom::ZoomController::FromWebContents(web_contents),
733 default_zoom_changed); 736 default_zoom_changed);
734 } 737 }
735 738
736 void LocationBarViewMac::OnDefaultZoomLevelChanged() { 739 void LocationBarViewMac::OnDefaultZoomLevelChanged() {
737 if (UpdateZoomDecoration(/*default_zoom_changed=*/true)) 740 if (UpdateZoomDecoration(/*default_zoom_changed=*/true))
738 OnDecorationsChanged(); 741 OnDecorationsChanged();
739 } 742 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698