chrome/browser/ui/gtk/browser_toolbar_gtk.cc - Issue 10700027: browser: Move global error to subdir.

Side by Side Diff: chrome/browser/ui/gtk/browser_toolbar_gtk.cc

Issue 10700027: browser: Move global error to subdir. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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

« no previous file with comments | « chrome/browser/ui/global_error_service_unittest.cc ('k') | chrome/browser/ui/gtk/global_error_bubble.h » ('j') | no next file with comments »

OLD	NEW
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/gtk/browser_toolbar_gtk.h"	5 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"

6	6

7 #include <gdk/gdkkeysyms.h>	7 #include <gdk/gdkkeysyms.h>

8 #include <gtk/gtk.h>	8 #include <gtk/gtk.h>

9 #include <X11/XF86keysym.h>	9 #include <X11/XF86keysym.h>

10	10

11 #include "base/base_paths.h"	11 #include "base/base_paths.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/debug/trace_event.h"	13 #include "base/debug/trace_event.h"

14 #include "base/i18n/rtl.h"	14 #include "base/i18n/rtl.h"

15 #include "base/logging.h"	15 #include "base/logging.h"

16 #include "base/memory/singleton.h"	16 #include "base/memory/singleton.h"

17 #include "base/path_service.h"	17 #include "base/path_service.h"

18 #include "chrome/app/chrome_command_ids.h"	18 #include "chrome/app/chrome_command_ids.h"

19 #include "chrome/browser/net/url_fixer_upper.h"	19 #include "chrome/browser/net/url_fixer_upper.h"

20 #include "chrome/browser/prefs/pref_service.h"	20 #include "chrome/browser/prefs/pref_service.h"

21 #include "chrome/browser/profiles/profile.h"	21 #include "chrome/browser/profiles/profile.h"

22 #include "chrome/browser/themes/theme_service.h"	22 #include "chrome/browser/themes/theme_service.h"

23 #include "chrome/browser/ui/browser.h"	23 #include "chrome/browser/ui/browser.h"

24 #include "chrome/browser/ui/browser_commands.h"	24 #include "chrome/browser/ui/browser_commands.h"

25 #include "chrome/browser/ui/global_error_service.h"	25 #include "chrome/browser/ui/global_error/global_error_service.h"

26 #include "chrome/browser/ui/global_error_service_factory.h"	26 #include "chrome/browser/ui/global_error/global_error_service_factory.h"

27 #include "chrome/browser/ui/gtk/accelerators_gtk.h"	27 #include "chrome/browser/ui/gtk/accelerators_gtk.h"

28 #include "chrome/browser/ui/gtk/back_forward_button_gtk.h"	28 #include "chrome/browser/ui/gtk/back_forward_button_gtk.h"

29 #include "chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h"	29 #include "chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h"

30 #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"	30 #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"

31 #include "chrome/browser/ui/gtk/browser_window_gtk.h"	31 #include "chrome/browser/ui/gtk/browser_window_gtk.h"

32 #include "chrome/browser/ui/gtk/custom_button.h"	32 #include "chrome/browser/ui/gtk/custom_button.h"

33 #include "chrome/browser/ui/gtk/event_utils.h"	33 #include "chrome/browser/ui/gtk/event_utils.h"

34 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"	34 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"

35 #include "chrome/browser/ui/gtk/gtk_theme_service.h"	35 #include "chrome/browser/ui/gtk/gtk_theme_service.h"

36 #include "chrome/browser/ui/gtk/gtk_util.h"	36 #include "chrome/browser/ui/gtk/gtk_util.h"

(...skipping 650 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
687 const SkBitmap* badge = theme_service_->GetBitmapNamed(resource_id);	687 const SkBitmap* badge = theme_service_->GetBitmapNamed(resource_id);

688 gfx::CanvasSkiaPaint canvas(expose, false);	688 gfx::CanvasSkiaPaint canvas(expose, false);

689 int x_offset = base::i18n::IsRTL() ? 0 : allocation.width - badge->width();	689 int x_offset = base::i18n::IsRTL() ? 0 : allocation.width - badge->width();

690 int y_offset = 0;	690 int y_offset = 0;

691 canvas.DrawImageInt(*badge,	691 canvas.DrawImageInt(*badge,

692 allocation.x + x_offset,	692 allocation.x + x_offset,

693 allocation.y + y_offset);	693 allocation.y + y_offset);

694	694

695 return FALSE;	695 return FALSE;

696 }	696 }

OLD	NEW