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

Side by Side Diff: chrome/browser/external_tab_container_win.cc

Issue 6382009: views: Move grid_layout files into layout directory. Final Part. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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/chromeos/wm_overview_title.cc ('k') | chrome/browser/first_run/first_run_win.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/external_tab_container_win.h" 5 #include "chrome/browser/external_tab_container_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 28 matching lines...) Expand all
39 #include "chrome/common/render_messages.h" 39 #include "chrome/common/render_messages.h"
40 #include "chrome/common/render_messages_params.h" 40 #include "chrome/common/render_messages_params.h"
41 #include "chrome/common/native_web_keyboard_event.h" 41 #include "chrome/common/native_web_keyboard_event.h"
42 #include "chrome/common/notification_service.h" 42 #include "chrome/common/notification_service.h"
43 #include "chrome/common/page_transition_types.h" 43 #include "chrome/common/page_transition_types.h"
44 #include "chrome/common/url_constants.h" 44 #include "chrome/common/url_constants.h"
45 #include "grit/generated_resources.h" 45 #include "grit/generated_resources.h"
46 #include "grit/locale_settings.h" 46 #include "grit/locale_settings.h"
47 #include "ui/base/l10n/l10n_util.h" 47 #include "ui/base/l10n/l10n_util.h"
48 #include "ui/base/view_prop.h" 48 #include "ui/base/view_prop.h"
49 #include "views/grid_layout.h" 49 #include "views/layout/grid_layout.h"
50 #include "views/widget/root_view.h" 50 #include "views/widget/root_view.h"
51 #include "views/window/window.h" 51 #include "views/window/window.h"
52 52
53 using ui::ViewProp; 53 using ui::ViewProp;
54 54
55 static const char kWindowObjectKey[] = "ChromeWindowObject"; 55 static const char kWindowObjectKey[] = "ChromeWindowObject";
56 56
57 // This class overrides the LinkActivated function in the PageInfoBubbleView 57 // This class overrides the LinkActivated function in the PageInfoBubbleView
58 // class and routes the help center link navigation to the host browser. 58 // class and routes the help center link navigation to the host browser.
59 class ExternalTabPageInfoBubbleView : public PageInfoBubbleView { 59 class ExternalTabPageInfoBubbleView : public PageInfoBubbleView {
(...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 1112
1113 if (disposition == CURRENT_TAB) { 1113 if (disposition == CURRENT_TAB) {
1114 DCHECK(route_all_top_level_navigations_); 1114 DCHECK(route_all_top_level_navigations_);
1115 disposition = NEW_FOREGROUND_TAB; 1115 disposition = NEW_FOREGROUND_TAB;
1116 } 1116 }
1117 ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition, 1117 ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition,
1118 transition); 1118 transition);
1119 // support only one navigation for a dummy tab before it is killed. 1119 // support only one navigation for a dummy tab before it is killed.
1120 ::DestroyWindow(GetNativeView()); 1120 ::DestroyWindow(GetNativeView());
1121 } 1121 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/wm_overview_title.cc ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698