| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/app_launcher.h" | 5 #include "chrome/browser/views/app_launcher.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
| 12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 13 #include "base/utf_string_conversions.h" |
| 13 #include "chrome/app/chrome_dll_resource.h" | 14 #include "chrome/app/chrome_dll_resource.h" |
| 14 #include "chrome/browser/browser.h" | 15 #include "chrome/browser/browser.h" |
| 15 #include "chrome/browser/profile.h" | 16 #include "chrome/browser/profile.h" |
| 16 #include "chrome/browser/view_ids.h" | 17 #include "chrome/browser/view_ids.h" |
| 17 #include "chrome/browser/views/dom_view.h" | 18 #include "chrome/browser/views/dom_view.h" |
| 18 #include "chrome/browser/views/info_bubble.h" | 19 #include "chrome/browser/views/info_bubble.h" |
| 19 #include "chrome/browser/views/frame/browser_view.h" | 20 #include "chrome/browser/views/frame/browser_view.h" |
| 20 #include "chrome/browser/views/location_bar/location_bar_view.h" | 21 #include "chrome/browser/views/location_bar/location_bar_view.h" |
| 21 #include "chrome/common/url_constants.h" | 22 #include "chrome/common/url_constants.h" |
| 22 #include "views/widget/root_view.h" | 23 #include "views/widget/root_view.h" |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 browser_->AddTabWithURL( | 388 browser_->AddTabWithURL( |
| 388 url, GURL(), transition, -1, | 389 url, GURL(), transition, -1, |
| 389 TabStripModel::ADD_SELECTED | TabStripModel::ADD_FORCE_INDEX, NULL, | 390 TabStripModel::ADD_SELECTED | TabStripModel::ADD_FORCE_INDEX, NULL, |
| 390 std::string()); | 391 std::string()); |
| 391 } | 392 } |
| 392 | 393 |
| 393 void AppLauncher::Resize(const gfx::Size& contents_size) { | 394 void AppLauncher::Resize(const gfx::Size& contents_size) { |
| 394 info_bubble_content_->ComputePreferredSize(contents_size); | 395 info_bubble_content_->ComputePreferredSize(contents_size); |
| 395 info_bubble_->SizeToContents(); | 396 info_bubble_->SizeToContents(); |
| 396 } | 397 } |
| OLD | NEW |