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

Side by Side Diff: chrome/browser/views/tabs/tab_strip.cc

Issue 109043: Move l10n_util to app/ (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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/views/tabs/tab_renderer.cc ('k') | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/views/tabs/tab_strip.h" 5 #include "chrome/browser/views/tabs/tab_strip.h"
6 6
7 #include "app/l10n_util.h"
7 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
8 #include "app/slide_animation.h" 9 #include "app/slide_animation.h"
9 #include "base/gfx/size.h" 10 #include "base/gfx/size.h"
10 #include "base/stl_util-inl.h" 11 #include "base/stl_util-inl.h"
11 #include "chrome/browser/metrics/user_metrics.h" 12 #include "chrome/browser/metrics/user_metrics.h"
12 #include "chrome/browser/profile.h" 13 #include "chrome/browser/profile.h"
13 #include "chrome/browser/tab_contents/tab_contents.h" 14 #include "chrome/browser/tab_contents/tab_contents.h"
14 #include "chrome/browser/tabs/tab_strip_model.h" 15 #include "chrome/browser/tabs/tab_strip_model.h"
15 #include "chrome/browser/view_ids.h" 16 #include "chrome/browser/view_ids.h"
16 #include "chrome/browser/views/tabs/dragged_tab_controller.h" 17 #include "chrome/browser/views/tabs/dragged_tab_controller.h"
17 #include "chrome/browser/views/tabs/tab.h" 18 #include "chrome/browser/views/tabs/tab.h"
18 #include "chrome/browser/tab_contents/tab_contents.h" 19 #include "chrome/browser/tab_contents/tab_contents.h"
19 #include "chrome/common/drag_drop_types.h" 20 #include "chrome/common/drag_drop_types.h"
20 #include "chrome/common/gfx/chrome_canvas.h" 21 #include "chrome/common/gfx/chrome_canvas.h"
21 #include "chrome/common/gfx/path.h" 22 #include "chrome/common/gfx/path.h"
22 #include "chrome/common/l10n_util.h"
23 #include "chrome/common/os_exchange_data.h" 23 #include "chrome/common/os_exchange_data.h"
24 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
25 #include "chrome/common/win_util.h" 25 #include "chrome/common/win_util.h"
26 #include "chrome/views/controls/image_view.h" 26 #include "chrome/views/controls/image_view.h"
27 #include "chrome/views/painter.h" 27 #include "chrome/views/painter.h"
28 #include "chrome/views/window/non_client_view.h" 28 #include "chrome/views/window/non_client_view.h"
29 #include "chrome/views/window/window.h" 29 #include "chrome/views/window/window.h"
30 #include "grit/generated_resources.h" 30 #include "grit/generated_resources.h"
31 #include "grit/theme_resources.h" 31 #include "grit/theme_resources.h"
32 32
(...skipping 1488 matching lines...) Expand 10 before | Expand all | Expand 10 after
1521 // If the TabContents being detached was removed as a result of a drag 1521 // If the TabContents being detached was removed as a result of a drag
1522 // gesture from its corresponding Tab, we don't want to remove the Tab from 1522 // gesture from its corresponding Tab, we don't want to remove the Tab from
1523 // the child list, because if we do so it'll stop receiving events and the 1523 // the child list, because if we do so it'll stop receiving events and the
1524 // drag will stall. So we only remove if a drag isn't active, or the Tab 1524 // drag will stall. So we only remove if a drag isn't active, or the Tab
1525 // was for some other TabContents. 1525 // was for some other TabContents.
1526 if (!IsDragSessionActive() || !drag_controller_->IsDragSourceTab(removed)) { 1526 if (!IsDragSessionActive() || !drag_controller_->IsDragSourceTab(removed)) {
1527 removed->GetParent()->RemoveChildView(removed); 1527 removed->GetParent()->RemoveChildView(removed);
1528 delete removed; 1528 delete removed;
1529 } 1529 }
1530 } 1530 }
OLDNEW
« no previous file with comments | « chrome/browser/views/tabs/tab_renderer.cc ('k') | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698