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

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc 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
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/gtk/reload_button_gtk.h" 5 #include "chrome/browser/ui/gtk/reload_button_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "chrome/app/chrome_command_ids.h" 11 #include "chrome/app/chrome_command_ids.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_commands.h" 13 #include "chrome/browser/ui/browser_commands.h"
14 #include "chrome/browser/ui/gtk/event_utils.h" 14 #include "chrome/browser/ui/gtk/event_utils.h"
15 #include "chrome/browser/ui/gtk/gtk_chrome_button.h" 15 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
16 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 16 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
17 #include "chrome/browser/ui/gtk/gtk_util.h" 17 #include "chrome/browser/ui/gtk/gtk_util.h"
18 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" 18 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
19 #include "chrome/common/chrome_notification_types.h" 19 #include "chrome/common/chrome_notification_types.h"
20 #include "content/public/browser/notification_source.h" 20 #include "content/public/browser/notification_source.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
23 #include "grit/theme_resources_standard.h"
24 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
25 24
26 // The width of this button in GTK+ theme mode. The Stop and Refresh stock icons 25 // The width of this button in GTK+ theme mode. The Stop and Refresh stock icons
27 // can be different sizes; this variable is used to make sure that the button 26 // can be different sizes; this variable is used to make sure that the button
28 // doesn't change sizes when switching between the two. 27 // doesn't change sizes when switching between the two.
29 static int GtkButtonWidth = 0; 28 static int GtkButtonWidth = 0;
30 29
31 //////////////////////////////////////////////////////////////////////////////// 30 ////////////////////////////////////////////////////////////////////////////////
32 // ReloadButton, public: 31 // ReloadButton, public:
33 32
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 gtk_chrome_button_set_use_gtk_rendering(GTK_CHROME_BUTTON(widget()), use_gtk); 275 gtk_chrome_button_set_use_gtk_rendering(GTK_CHROME_BUTTON(widget()), use_gtk);
277 } 276 }
278 277
279 void ReloadButtonGtk::OnDoubleClickTimer() { 278 void ReloadButtonGtk::OnDoubleClickTimer() {
280 ChangeMode(intended_mode_, false); 279 ChangeMode(intended_mode_, false);
281 } 280 }
282 281
283 void ReloadButtonGtk::OnStopToReloadTimer() { 282 void ReloadButtonGtk::OnStopToReloadTimer() {
284 ChangeMode(intended_mode_, true); 283 ChangeMode(intended_mode_, true);
285 } 284 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/password_generation_bubble_gtk.cc ('k') | chrome/browser/ui/gtk/sad_tab_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698