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

Side by Side Diff: chrome/browser/ui/gtk/tabs/tab_strip_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/tabs/tab_strip_gtk.h" 5 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/ui/gtk/tabs/tab_strip_menu_controller.h" 31 #include "chrome/browser/ui/gtk/tabs/tab_strip_menu_controller.h"
32 #include "chrome/browser/ui/tab_contents/tab_contents.h" 32 #include "chrome/browser/ui/tab_contents/tab_contents.h"
33 #include "chrome/browser/ui/tabs/tab_strip_model.h" 33 #include "chrome/browser/ui/tabs/tab_strip_model.h"
34 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 34 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
35 #include "chrome/common/chrome_notification_types.h" 35 #include "chrome/common/chrome_notification_types.h"
36 #include "content/public/browser/notification_source.h" 36 #include "content/public/browser/notification_source.h"
37 #include "content/public/browser/user_metrics.h" 37 #include "content/public/browser/user_metrics.h"
38 #include "content/public/browser/web_contents.h" 38 #include "content/public/browser/web_contents.h"
39 #include "grit/generated_resources.h" 39 #include "grit/generated_resources.h"
40 #include "grit/theme_resources.h" 40 #include "grit/theme_resources.h"
41 #include "grit/theme_resources_standard.h"
42 #include "grit/ui_resources.h" 41 #include "grit/ui_resources.h"
43 #include "ui/base/animation/animation_delegate.h" 42 #include "ui/base/animation/animation_delegate.h"
44 #include "ui/base/animation/slide_animation.h" 43 #include "ui/base/animation/slide_animation.h"
45 #include "ui/base/dragdrop/gtk_dnd_util.h" 44 #include "ui/base/dragdrop/gtk_dnd_util.h"
46 #include "ui/base/gtk/gtk_compat.h" 45 #include "ui/base/gtk/gtk_compat.h"
47 #include "ui/base/gtk/gtk_screen_util.h" 46 #include "ui/base/gtk/gtk_screen_util.h"
48 #include "ui/base/l10n/l10n_util.h" 47 #include "ui/base/l10n/l10n_util.h"
49 #include "ui/base/resource/resource_bundle.h" 48 #include "ui/base/resource/resource_bundle.h"
50 #include "ui/gfx/gtk_util.h" 49 #include "ui/gfx/gtk_util.h"
51 #include "ui/gfx/image/image.h" 50 #include "ui/gfx/image/image.h"
(...skipping 2214 matching lines...) Expand 10 before | Expand all | Expand 10 after
2266 } 2265 }
2267 2266
2268 void TabStripGtk::SetNewTabButtonBackground() { 2267 void TabStripGtk::SetNewTabButtonBackground() {
2269 SkColor color = theme_service_->GetColor( 2268 SkColor color = theme_service_->GetColor(
2270 ThemeService::COLOR_BUTTON_BACKGROUND); 2269 ThemeService::COLOR_BUTTON_BACKGROUND);
2271 SkBitmap* background = theme_service_->GetBitmapNamed( 2270 SkBitmap* background = theme_service_->GetBitmapNamed(
2272 IDR_THEME_WINDOW_CONTROL_BACKGROUND); 2271 IDR_THEME_WINDOW_CONTROL_BACKGROUND);
2273 SkBitmap* mask = theme_service_->GetBitmapNamed(IDR_NEWTAB_BUTTON_MASK); 2272 SkBitmap* mask = theme_service_->GetBitmapNamed(IDR_NEWTAB_BUTTON_MASK);
2274 newtab_button_->SetBackground(color, background, mask); 2273 newtab_button_->SetBackground(color, background, mask);
2275 } 2274 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc ('k') | chrome/browser/ui/gtk/task_manager_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698