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

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

Issue 1581473002: Remove base/win/metro.{cc|h} and some associated code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 years, 11 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 #include "net/url_request/url_request_context.h" 207 #include "net/url_request/url_request_context.h"
208 #include "third_party/WebKit/public/web/WebWindowFeatures.h" 208 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
209 #include "ui/base/l10n/l10n_util.h" 209 #include "ui/base/l10n/l10n_util.h"
210 #include "ui/base/window_open_disposition.h" 210 #include "ui/base/window_open_disposition.h"
211 #include "ui/gfx/geometry/point.h" 211 #include "ui/gfx/geometry/point.h"
212 #include "ui/shell_dialogs/selected_file_info.h" 212 #include "ui/shell_dialogs/selected_file_info.h"
213 213
214 #if defined(OS_WIN) 214 #if defined(OS_WIN)
215 #include <windows.h> 215 #include <windows.h>
216 #include <shellapi.h> 216 #include <shellapi.h>
217 #include "base/win/metro.h"
218 #include "chrome/browser/task_manager/task_manager.h" 217 #include "chrome/browser/task_manager/task_manager.h"
219 #include "chrome/browser/ui/view_ids.h" 218 #include "chrome/browser/ui/view_ids.h"
220 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h" 219 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
221 #include "ui/base/touch/touch_device.h" 220 #include "ui/base/touch/touch_device.h"
222 #include "ui/base/win/shell.h" 221 #include "ui/base/win/shell.h"
223 #endif // OS_WIN 222 #endif // OS_WIN
224 223
225 #if defined(OS_CHROMEOS) 224 #if defined(OS_CHROMEOS)
226 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h" 225 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"
227 #endif 226 #endif
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 window_(NULL), 374 window_(NULL),
376 tab_strip_model_delegate_(new chrome::BrowserTabStripModelDelegate(this)), 375 tab_strip_model_delegate_(new chrome::BrowserTabStripModelDelegate(this)),
377 tab_strip_model_( 376 tab_strip_model_(
378 new TabStripModel(tab_strip_model_delegate_.get(), params.profile)), 377 new TabStripModel(tab_strip_model_delegate_.get(), params.profile)),
379 app_name_(params.app_name), 378 app_name_(params.app_name),
380 is_trusted_source_(params.trusted_source), 379 is_trusted_source_(params.trusted_source),
381 cancel_download_confirmation_state_(NOT_PROMPTED), 380 cancel_download_confirmation_state_(NOT_PROMPTED),
382 override_bounds_(params.initial_bounds), 381 override_bounds_(params.initial_bounds),
383 initial_show_state_(params.initial_show_state), 382 initial_show_state_(params.initial_show_state),
384 is_session_restore_(params.is_session_restore), 383 is_session_restore_(params.is_session_restore),
385 host_desktop_type_( 384 host_desktop_type_(params.host_desktop_type),
386 BrowserWindow::AdjustHostDesktopType(params.host_desktop_type)),
387 content_setting_bubble_model_delegate_( 385 content_setting_bubble_model_delegate_(
388 new BrowserContentSettingBubbleModelDelegate(this)), 386 new BrowserContentSettingBubbleModelDelegate(this)),
389 toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)), 387 toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)),
390 live_tab_context_(new BrowserLiveTabContext(this)), 388 live_tab_context_(new BrowserLiveTabContext(this)),
391 synced_window_delegate_(new BrowserSyncedWindowDelegate(this)), 389 synced_window_delegate_(new BrowserSyncedWindowDelegate(this)),
392 bookmark_bar_state_(BookmarkBar::HIDDEN), 390 bookmark_bar_state_(BookmarkBar::HIDDEN),
393 command_controller_(new chrome::BrowserCommandController(this)), 391 command_controller_(new chrome::BrowserCommandController(this)),
394 window_has_shown_(false), 392 window_has_shown_(false),
395 chrome_updater_factory_(this), 393 chrome_updater_factory_(this),
396 weak_factory_(this) { 394 weak_factory_(this) {
(...skipping 2341 matching lines...) Expand 10 before | Expand all | Expand 10 after
2738 if (contents && !allow_js_access) { 2736 if (contents && !allow_js_access) {
2739 contents->web_contents()->GetController().LoadURL( 2737 contents->web_contents()->GetController().LoadURL(
2740 target_url, 2738 target_url,
2741 content::Referrer(), 2739 content::Referrer(),
2742 ui::PAGE_TRANSITION_LINK, 2740 ui::PAGE_TRANSITION_LINK,
2743 std::string()); // No extra headers. 2741 std::string()); // No extra headers.
2744 } 2742 }
2745 2743
2746 return contents != NULL; 2744 return contents != NULL;
2747 } 2745 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698