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

Side by Side Diff: chrome/browser/ui/views/location_bar/content_setting_image_view.cc

Issue 12208010: Adding device selection menus to the content setting bubble (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed the windows code. Created 7 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h" 5 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 8 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
9 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 9 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
10 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" 10 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 if (bubble_widget_) 124 if (bubble_widget_)
125 return; 125 return;
126 126
127 Profile* profile = parent->profile(); 127 Profile* profile = parent->profile();
128 ContentSettingBubbleContents* bubble = new ContentSettingBubbleContents( 128 ContentSettingBubbleContents* bubble = new ContentSettingBubbleContents(
129 ContentSettingBubbleModel::CreateContentSettingBubbleModel( 129 ContentSettingBubbleModel::CreateContentSettingBubbleModel(
130 parent->delegate()->GetContentSettingBubbleModelDelegate(), 130 parent->delegate()->GetContentSettingBubbleModelDelegate(),
131 web_contents, 131 web_contents,
132 profile, 132 profile,
133 content_setting_image_model_->get_content_settings_type()), 133 content_setting_image_model_->get_content_settings_type()),
134 profile,
134 web_contents, 135 web_contents,
135 this, 136 this,
136 views::BubbleBorder::TOP_RIGHT); 137 views::BubbleBorder::TOP_RIGHT);
137 bubble_widget_ = parent->delegate()->CreateViewsBubble(bubble); 138 bubble_widget_ = parent->delegate()->CreateViewsBubble(bubble);
138 bubble_widget_->AddObserver(this); 139 bubble_widget_->AddObserver(this);
139 bubble->Show(); 140 bubble->Show();
140 } 141 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698