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

Side by Side Diff: chrome/browser/gtk/location_bar_view_gtk.cc

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/gtk/location_bar_view_gtk.h" 5 #include "chrome/browser/gtk/location_bar_view_gtk.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/gtk_dnd_util.h" 9 #include "app/gtk_dnd_util.h"
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
11 #include "app/resource_bundle.h" 11 #include "app/resource_bundle.h"
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/i18n/rtl.h" 13 #include "base/i18n/rtl.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/app/chrome_dll_resource.h" 17 #include "chrome/app/chrome_command_ids.h"
18 #include "chrome/browser/accessibility_events.h" 18 #include "chrome/browser/accessibility_events.h"
19 #include "chrome/browser/alternate_nav_url_fetcher.h" 19 #include "chrome/browser/alternate_nav_url_fetcher.h"
20 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h" 20 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
21 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" 21 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
22 #include "chrome/browser/browser.h" 22 #include "chrome/browser/browser.h"
23 #include "chrome/browser/browser_list.h" 23 #include "chrome/browser/browser_list.h"
24 #include "chrome/browser/command_updater.h" 24 #include "chrome/browser/command_updater.h"
25 #include "chrome/browser/content_setting_bubble_model.h" 25 #include "chrome/browser/content_setting_bubble_model.h"
26 #include "chrome/browser/content_setting_image_model.h" 26 #include "chrome/browser/content_setting_image_model.h"
27 #include "chrome/browser/defaults.h" 27 #include "chrome/browser/defaults.h"
(...skipping 1488 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 1516
1517 std::string badge_text = page_action_->GetBadgeText(tab_id); 1517 std::string badge_text = page_action_->GetBadgeText(tab_id);
1518 if (badge_text.empty()) 1518 if (badge_text.empty())
1519 return FALSE; 1519 return FALSE;
1520 1520
1521 gfx::CanvasSkiaPaint canvas(event, false); 1521 gfx::CanvasSkiaPaint canvas(event, false);
1522 gfx::Rect bounding_rect(widget->allocation); 1522 gfx::Rect bounding_rect(widget->allocation);
1523 page_action_->PaintBadge(&canvas, bounding_rect, tab_id); 1523 page_action_->PaintBadge(&canvas, bounding_rect, tab_id);
1524 return FALSE; 1524 return FALSE;
1525 } 1525 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698