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

Side by Side Diff: chrome/browser/ui/views/content_setting_bubble_contents.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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/content_setting_bubble_contents.h" 5 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "chrome/browser/content_settings/host_content_settings_map.h" 15 #include "chrome/browser/content_settings/host_content_settings_map.h"
16 #include "chrome/browser/plugins/plugin_finder.h" 16 #include "chrome/browser/plugins/plugin_finder.h"
17 #include "chrome/browser/plugins/plugin_metadata.h" 17 #include "chrome/browser/plugins/plugin_metadata.h"
18 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 18 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
19 #include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h" 19 #include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h"
20 #include "chrome/browser/ui/views/browser_dialogs.h" 20 #include "chrome/browser/ui/views/browser_dialogs.h"
21 #include "chrome/grit/generated_resources.h"
21 #include "content/public/browser/plugin_service.h" 22 #include "content/public/browser/plugin_service.h"
22 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
23 #include "grit/generated_resources.h"
24 #include "grit/theme_resources.h" 24 #include "grit/theme_resources.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/models/simple_menu_model.h" 26 #include "ui/base/models/simple_menu_model.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/gfx/font_list.h" 28 #include "ui/gfx/font_list.h"
29 #include "ui/gfx/text_utils.h" 29 #include "ui/gfx/text_utils.h"
30 #include "ui/views/controls/button/label_button.h" 30 #include "ui/views/controls/button/label_button.h"
31 #include "ui/views/controls/button/menu_button.h" 31 #include "ui/views/controls/button/menu_button.h"
32 #include "ui/views/controls/button/radio_button.h" 32 #include "ui/views/controls/button/radio_button.h"
33 #include "ui/views/controls/image_view.h" 33 #include "ui/views/controls/image_view.h"
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 // Make sure the width is at least kMinMediaMenuButtonWidth. The 500 // Make sure the width is at least kMinMediaMenuButtonWidth. The
501 // maximum width will be clamped by kMaxContentsWidth of the view. 501 // maximum width will be clamped by kMaxContentsWidth of the view.
502 menu_width = std::max(kMinMediaMenuButtonWidth, menu_width + margins); 502 menu_width = std::max(kMinMediaMenuButtonWidth, menu_width + margins);
503 503
504 for (MediaMenuPartsMap::const_iterator i = media_menus_.begin(); 504 for (MediaMenuPartsMap::const_iterator i = media_menus_.begin();
505 i != media_menus_.end(); ++i) { 505 i != media_menus_.end(); ++i) {
506 i->first->SetMinSize(gfx::Size(menu_width, 0)); 506 i->first->SetMinSize(gfx::Size(menu_width, 0));
507 i->first->SetMaxSize(gfx::Size(menu_width, 0)); 507 i->first->SetMaxSize(gfx::Size(menu_width, 0));
508 } 508 }
509 } 509 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/conflicting_module_view_win.cc ('k') | chrome/browser/ui/views/create_application_shortcut_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698